merge 3 dictionary packs into 1

2 files changed, 16 insertions, 48 deletions

diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 3d0f68ab7663..0f083e9bfcce 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -572,49 +572,17 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Root_Extension_Dictionary_De_AT"
+module = "gid_Module_Root_Extension_Dictionary_De"
 script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
 requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "De-AT dictionary for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
-module = "gid_Module_Root_Extension_Dictionary_De_CH"
-script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
-linuxpatchrequires = ""
-copyright = "1999-2010 by Oracle"
-solariscopyright = "solariscopyrightfile"
-vendor = "Oracle"
-description = "De-CH dictionary for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
-module = "gid_Module_Root_Extension_Dictionary_De_DE"
-script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
-linuxpatchrequires = ""
-copyright = "1999-2010 by Oracle"
-solariscopyright = "solariscopyrightfile"
-vendor = "Oracle"
-description = "De-DE dictionary for %PRODUCTNAME %PRODUCTVERSION"
+description = "De dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 08de3a622369..517295858daf 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -13,8 +13,8 @@ ar = "EMPTY"
 br = "br,fr"
 ca = "ca,es,fr"
 cs = "cs"
-da = "da,de-DE"
-de = "de-DE,de-AT,de-CH,fr,it"
+da = "da,de"
+de = "de,fr,it"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 es = "es,fr,pt"
@@ -22,26 +22,26 @@ et = "et"
 fr = "fr,es"
 gl = "gl,pt,es"
 he = "he"
-hu = "hu,de-DE"
-hr = "hr,de-DE"
-it = "it,de-DE,fr"
+hu = "hu,de"
+hr = "hr,de"
+it = "it,de,fr"
 ja = "EMPTY"
 ko = "EMPTY"
 ku = "ku-TR"
 lt = "lt"
-nb = "no,fr,de-DE,es"
+nb = "no,fr,de,es"
 ne = "ne"
-nl = "nl,fr,de-DE"
-nn = "no,fr,de-DE,es"
+nl = "nl,fr,de"
+nn = "no,fr,de,es"
 oc = "oc,fr"
-pl = "pl,de-DE,ru"
+pl = "pl,de,ru"
 pt-BR = "pt,es"
 pt = "pt,es"
-ro = "ro,de-DE,hu"
-ru = "ru,de-DE"
+ro = "ro,de,hu"
+ru = "ru,de"
 sk = "sk"
 sl = "sl"
-sv = "sv,de-DE"
+sv = "sv,de"
 sr = "sr"
 # ! Note the package 'sr' also holds the dictionaries for 'sh' !
 sh = "sr"