[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - scp2/source setup_native/source

Andras Timar andras.timar at collabora.com
Sun Nov 24 11:47:10 PST 2013


 scp2/source/ooo/common_brand.scp                        |    9 +++++++--
 scp2/source/ooo/file_ooo.scp                            |   13 +++++++++++--
 scp2/source/ooo/module_ooo.scp                          |   11 +++++++++++
 scp2/source/ooo/module_ooo.ulf                          |    8 +++++++-
 setup_native/source/packinfo/packinfo_office.txt        |   15 +++++++++++++++
 setup_native/source/packinfo/spellchecker_selection.txt |    1 +
 6 files changed, 52 insertions(+), 5 deletions(-)

New commits:
commit 565b5ab16aa6e3b7cfaccf0391d2d6f4c13269a3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Nov 24 19:33:36 2013 +0100

    Add lo_LA (Lao) dictionary fdo#71939
    
    Change-Id: Idbc102453aa47a71d7b550eb8a7b65c25825111e

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 205f33c..643e8df 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -299,6 +299,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Kmr_Latn
     DosName = "dict-kmr-Latn";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Lo
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-lo";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Lt
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-lt";
@@ -432,7 +437,7 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
     Styles = (CREATE);
 End
 
-Directory gid_Brand_Dir_Share_Glade 
+Directory gid_Brand_Dir_Share_Glade
     ParentID = gid_Brand_Dir_Share;
     DosName = "glade";
 End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index e8be228..08ed086 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1,7 +1,7 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -701,7 +701,7 @@ File gid_Starregistry_Services_Rdb
     Styles = (PACKED);
 End
 
-#ifdef MACOSX 
+#ifdef MACOSX
 File gid_File_App_InfoPlist
     TXT_FILE_BODY;
     Dir = FILELIST_DIR;
@@ -1004,6 +1004,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Lo
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-lo.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lt
 	Dir = FILELIST_DIR;
 	Name = "Dictionary/dict-lt.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 7d9e5fa..1d54adf 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -354,6 +354,17 @@ Module gid_Module_Root_Extension_Dictionary_Lt
     Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Lo
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LO );
+    Files = (gid_File_Extension_Dictionary_Lo);
+    InstallOrder = "2000";
+    Sortkey = "633";
+    Spellcheckerlanguage = "lo";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Lv
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LV );
     Files = (gid_File_Extension_Dictionary_Lv);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 8b6cc4f..adc8be9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
- 
+
 [STR_NAME_MODULE_ROOT_OSL]
 en-US = "%PRODUCTNAME %PRODUCTVERSION"
 
@@ -202,6 +202,12 @@ en-US = "Kurdish, Northern, Latin script"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_KMR_LATN]
 en-US = "Kurdish, Northern, Latin script spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LO]
+en-US = "Lao spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_LT]
 en-US = "Lithuanian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 3e52e55..1c8b84e 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -853,6 +853,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Lo"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lo"
+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-lo"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02 %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03 %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04 %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05 %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06 %PACKAGEVERSION %PACKAGEVERSION-1,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07 %PACKAGEVERSION %PACKAGEVERSION-1,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-1"
+linuxpatchrequires = ""
+copyright = "2013 by Brian Eugene Wilson, Robert Martin Campbell"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Lo dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Lt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt"
 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"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index bc5d182..12e5f59 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -57,6 +57,7 @@ it = "it,de,fr"
 ja = "EMPTY"
 kmr-Latn = "kmr-Latn-TR"
 ko = "EMPTY"
+lo = "lo"
 lt = "lt,de,pl,ru"
 lv = "lv"
 nb = "no,fr,de,es"


More information about the Libreoffice-commits mailing list