[Libreoffice-commits] .: scp2/source setup_native/source

[Andras Timar]

 scp2/source/ooo/common_brand.scp                        |    5 +++++
 scp2/source/ooo/file_ooo.scp                            |    9 +++++++++
 scp2/source/ooo/module_ooo.scp                          |   13 ++++++++++++-
 scp2/source/ooo/module_ooo.ulf                          |    6 ++++++
 setup_native/source/packinfo/packinfo_office.txt        |   16 ++++++++++++++++
 setup_native/source/packinfo/spellchecker_selection.txt |    2 +-
 6 files changed, 49 insertions(+), 2 deletions(-)

New commits:
commit 9cb0e7af9d5d123a6e0cb933fb43d0f53ab4b904
Author: Andras Timar <atimar at suse.com>
Date:   Thu Dec 8 13:33:17 2011 +0100

    add Aragonese spelling dictionary

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 203f148..cf0a577 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -197,6 +197,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af
     DosName = "dict-af";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_An
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-an";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Ar
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-ar";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b4630a6..b87b7fa 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1313,6 +1313,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_An
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_An;
+	Name = "dict-an.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ar
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar;
 	Name = "dict-ar.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 473a026..5b76205 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -60,13 +60,24 @@ Module gid_Module_Root_Extension_Dictionary_Af
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
     Files = (gid_File_Extension_Dictionary_Af);
     InstallOrder = "2000";
-    Sortkey = "510";
+    Sortkey = "500";
     Spellcheckerlanguage = "af";
     PackageInfo = "packinfo_office.txt";
     ParentID = gid_Module_Dictionaries;
     Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_An
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AN );
+    Files = (gid_File_Extension_Dictionary_An);
+    InstallOrder = "2000";
+    Sortkey = "510";
+    Spellcheckerlanguage = "an";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Ar
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR );
     Files = (gid_File_Extension_Dictionary_Ar);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 4573c89..7fbb685 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -55,6 +55,12 @@ en-US = "Afrikaans"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
 en-US = "Afrikaans spelling dictionary, and hyphenation rules"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AN]
+en-US = "Aragonese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AN]
+en-US = "Aragonese spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_AR]
 en-US = "Arabic"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 10b23b4..f7166f1 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -462,6 +462,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_An"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-an"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-an"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "2011 Santiago Paricio, Juan Pablo Martinez"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "An dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Ar"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ar"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 53835d6..ee6ba51 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -21,7 +21,7 @@ de = "de,fr,it"
 el = "el"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
-es = "es,fr,pt"
+es = "an,es,fr,pt"
 et = "et"
 fr = "fr,es"
 gd = "gd"