[Libreoffice-commits] .: Dictionary_pt-BR.mk Dictionary_pt.mk Dictionary_pt-pt.mk Dictionary_pt-PT.mk .gitignore

Tue Oct 16 15:15:05 PDT 2012

.gitignore          |   55 ----------------------------------------------------
 Dictionary_pt-BR.mk |   21 +++++++++++++++++++
 Dictionary_pt-PT.mk |   26 ++++++++++++++++++++++++
 Dictionary_pt-pt.mk |   26 ------------------------
 Dictionary_pt.mk    |   21 -------------------
 5 files changed, 47 insertions(+), 102 deletions(-)

New commits:
commit 2547e9657a49fb43e07a41aadfdd0af34b7ae720
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Oct 16 16:32:25 2012 -0500

    rename mishappe during merge

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index eb75b8c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman at redhat.com>
-#   (initial developer) ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-# Backup files:
-*~
-
-# Build directories:
-/dictionaries/unxlng??
-/dictionaries/unxlng??.pro
-/dictionaries/unxlng???
-/dictionaries/unxlng???.pro
-/dictionaries/wntmsc???
-/dictionaries/wntmsc???.pro
-/dictionaries/wntgcc?
-/dictionaries/wntgcc?.pro
-/dictionaries/unxmac??
-/dictionaries/unxmac??.pro
-/dictionaries/unx?bsd??
-/dictionaries/unx?bsd??.pro
-/dictionaries/unxdfly??
-/dictionaries/unxdfly??.pro
-/dictionaries/unxso???
-/dictionaries/unxso???.pro
-/dictionaries/unxaig??
-/dictionaries/unxaig??.pro
-/dictionaries/unxios?
-/dictionaries/unxios?.pro
-/dictionaries/unxand?
-/dictionaries/unxand?.pro
-
diff --git a/Dictionary_pt-BR.mk b/Dictionary_pt-BR.mk
new file mode 100644
index 0000000..9e0d45f
--- /dev/null
+++ b/Dictionary_pt-BR.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-pt,dictionaries/pt_BR))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-pt,\
+	dictionaries/pt_BR/hyph_pt_BR.dic \
+	dictionaries/pt_BR/pt_BR.aff \
+	dictionaries/pt_BR/pt_BR.dic \
+	dictionaries/pt_BR/README_en.txt \
+	dictionaries/pt_BR/README_hyph_pt_BR.txt \
+	dictionaries/pt_BR/README_pt_BR.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Dictionary_pt-PT.mk b/Dictionary_pt-PT.mk
new file mode 100644
index 0000000..12c68fe
--- /dev/null
+++ b/Dictionary_pt-PT.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-pt-pt,dictionaries/pt_PT))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-pt-pt,\
+	dictionaries/pt_PT/hyph_pt_PT.dic \
+	dictionaries/pt_PT/LICENSES.txt \
+	dictionaries/pt_PT/pt_PT.aff \
+	dictionaries/pt_PT/pt_PT.dic \
+	dictionaries/pt_PT/README_hyph_pt_PT.txt \
+	dictionaries/pt_PT/README_pt_PT.txt \
+	dictionaries/pt_PT/README_th_pt_PT_v2.txt \
+))
+
+$(eval $(call gb_Dictionary_add_thesauri,dict-pt-pt,\
+	dictionaries/pt_PT/th_pt_PT_v2.dat \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Dictionary_pt-pt.mk b/Dictionary_pt-pt.mk
deleted file mode 100644
index 12c68fe..0000000
--- a/Dictionary_pt-pt.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Dictionary_Dictionary,dict-pt-pt,dictionaries/pt_PT))
-
-$(eval $(call gb_Dictionary_add_root_files,dict-pt-pt,\
-	dictionaries/pt_PT/hyph_pt_PT.dic \
-	dictionaries/pt_PT/LICENSES.txt \
-	dictionaries/pt_PT/pt_PT.aff \
-	dictionaries/pt_PT/pt_PT.dic \
-	dictionaries/pt_PT/README_hyph_pt_PT.txt \
-	dictionaries/pt_PT/README_pt_PT.txt \
-	dictionaries/pt_PT/README_th_pt_PT_v2.txt \
-))
-
-$(eval $(call gb_Dictionary_add_thesauri,dict-pt-pt,\
-	dictionaries/pt_PT/th_pt_PT_v2.dat \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/Dictionary_pt.mk b/Dictionary_pt.mk
deleted file mode 100644
index 9e0d45f..0000000
--- a/Dictionary_pt.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Dictionary_Dictionary,dict-pt,dictionaries/pt_BR))
-
-$(eval $(call gb_Dictionary_add_root_files,dict-pt,\
-	dictionaries/pt_BR/hyph_pt_BR.dic \
-	dictionaries/pt_BR/pt_BR.aff \
-	dictionaries/pt_BR/pt_BR.dic \
-	dictionaries/pt_BR/README_en.txt \
-	dictionaries/pt_BR/README_hyph_pt_BR.txt \
-	dictionaries/pt_BR/README_pt_BR.txt \
-))
-
-# vim: set noet sw=4 ts=4:
