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

[Libreoffice Gerrit user]

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

New commits:
commit de893783106ba47afe9db4e403394f88b6bd28df
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Fri Aug 31 19:31:22 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 5 12:51:32 2018 +0200

    package Indonesian (id) dictionaries into installset
    
    Change-Id: I78b8c745b9d6e4a23fa13622188c5bd1776b0ac6
    Reviewed-on: https://gerrit.libreoffice.org/59882
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 6c08039ebec28b936dd4521139c9670f7fadf9f4)
    Reviewed-on: https://gerrit.libreoffice.org/59889
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit a63927ea9c0103b6dbe45963dde0aca3845738d0)
    Reviewed-on: https://gerrit.libreoffice.org/59897
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6b6f2b896afb..0f34c027d85d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -491,6 +491,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Id
+        Dir = FILELIST_DIR;
+        Name = "Dictionary/dict-id.filelist";
+        Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+        TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Is
         Dir = FILELIST_DIR;
         Name = "Dictionary/dict-is.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index abfd1a824cb1..509f4b401572 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -401,6 +401,17 @@ Module gid_Module_Root_Extension_Dictionary_Hr
     Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Id
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ID );
+    Files = (gid_File_Extension_Dictionary_Id);
+    InstallOrder = "2000";
+    Sortkey = "607";
+    Spellcheckerlanguage = "id";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Is
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IS );
     Files = (gid_File_Extension_Dictionary_Is);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index a22df61068cd..88f25615d061 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -190,6 +190,12 @@ en-US = "Croatian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
 en-US = "Croatian spelling dictionary, and hyphenation rules"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ID]
+en-US = "Indonesian spelling dictionary, hyphenation rules, and thesaurus"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_IS]
 en-US = "Icelandic"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index f014aafdaa0b..ff128f991d79 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -727,6 +727,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Id"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-id"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-id"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2018 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Indonesian dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Is"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-is"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index cb2ed0c9a6bd..881ba99246e0 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -53,6 +53,7 @@ he = "he"
 hi = "hi"
 hu = "hu,de"
 hr = "hr,de"
+id = "id"
 is = "is"
 it = "it,de,fr"
 ja = "EMPTY"