fdo#82288 merge core01-core07 packages into just one

The core package will obsolete the individual ones (of the same
major.minor version)

Change-Id: I30dea2c08ec7eca052db2706b7f9f30f91e37095

2 files changed, 150 insertions, 218 deletions

diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 7658e51c3751..dfa159807587 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -73,223 +73,6 @@ End
 #endif
 #endif
 
-Module gid_Module_Root_Files_2
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "50";
-	Name = "gid_Module_Root_Files_2";
-	Description = "gid_Module_Root_Files_2";
-	Sortkey = "1200";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_shell_scripts,
-	gid_File_Bin_Pluginapp,
-	gid_File_Bin_Senddoc,
-	gid_File_Script_Gengal,
-	gid_File_Bin_Uri_Encode,
-	gid_File_Bin_UIPreviewer,
-	gid_File_Txt_Pagein_Common,
-	gid_File_Txt_Pagein_Calc,
-	gid_File_Txt_Pagein_Draw,
-	gid_File_Txt_Pagein_Impress,
-	gid_File_Txt_Pagein_Writer,
-	gid_File_extras_newfiles);
-End
-
-Module gid_Module_Root_Files_3
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "60";
-	Name = "gid_Module_Root_Files_3";
-	Description = "gid_Module_Root_Files_3";
-	Sortkey = "1300";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (
-	gid_File_Jar_Letter,
-	gid_File_Wizards_Common,
-	gid_File_Wizards_Fax,
-	gid_File_Jar_Agenda,
-	gid_File_Jar_Web,
-	gid_File_Rdb_Offapi,
-	gid_Starregistry_Services_Rdb);
-End
-
-Module gid_Module_Root_Files_4
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "30";
-	Name = "gid_Module_Root_Files_4";
-	Description = "gid_Module_Root_Files_4";
-	Sortkey = "1400";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (auto_ooo_ALL,
-	auto_ooobinarytable_ALL,
-	gid_File_Lib_Bib,
-	gid_File_Lib_J,
-	gid_File_Lib_Zip);
-End
-
-Module gid_Module_Root_Files_5
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "40";
-	Name = "gid_Module_Root_Files_5";
-	Description = "gid_Module_Root_Files_5";
-	Sortkey = "1500";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_Unixlink_File_Lib_Curl,
-	gid_File_Lib_Recentfile,
-	gid_File_Lib_Tab,
-	gid_File_Lib_Tab2,
-	gid_Unixlink_File_Lib_Raptor,
-	gid_Unixlink_File_Lib_Rasqal,
-	gid_Unixlink_File_Lib_Rdf,
-	gid_File_Lib_Sndfile,
-	gid_File_Lib_Neon,
-	gid_Unixlink_File_Lib_Xslt,
-	gid_Unixlink_File_Lib_eXslt,
-	gid_File_Lib_I18n,
-	gid_File_Lib_Accessbridge,
-	gid_File_Lib_Dl,
-    GID_FILE_LIB_WPD,
-	gid_File_Lib_Cli_Oootypes_Assembly,
-	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
-	gid_File_Lib_Policy_Cli_Oootypes_Config);
-    Unixlinks = (gid_Unixlink_File_Lib_Curl,
-	gid_Unixlink_File_Lib_Raptor,
-	gid_Unixlink_File_Lib_Rasqal,
-	gid_Unixlink_File_Lib_Rdf,
-	gid_Unixlink_File_Lib_Xslt,
-	gid_Unixlink_File_Lib_eXslt);
-End
-
-Module gid_Module_Root_Files_6
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "70";
-	Name = "gid_Module_Root_Files_6";
-	Description = "gid_Module_Root_Files_6";
-	Sortkey = "1600";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Basic_User,
-	gid_File_Basic_Share,
-	gid_File_Basic_User_Standard,
-	gid_File_Extra_Autotextuser,
-	gid_File_Extra_Cfgusr,
-	gid_File_Extra_Palettes,
-	gid_File_Extra_Database,
-	gid_File_Extra_Databasebiblio,
-	gid_File_Extra_Gallsound,
-	gid_File_Extra_Autocorr,
-	gid_File_Extra_Autocorr_Lang,
-	gid_File_Extra_Gallroot,
-	gid_File_Extra_Gallarrows,
-	gid_File_Extra_Gallcomputers,
-	gid_File_Extra_Galldiagrams,
-	gid_File_Extra_Galleducation,
-	gid_File_Extra_Gallenvironment,
-	gid_File_Extra_Gallfinance,
-	gid_File_Extra_Gallpeople,
-	gid_File_Extra_Gallsymbols,
-	gid_File_Extra_Galltransport,
-	gid_File_Extra_Galltxtshapes,
-	gid_File_Extra_Gallbullets,
-	gid_File_Extra_Gallhtmlexpo,
-	gid_File_Extra_Gallsystem,
-	gid_File_Extra_Gallsounds,
-	gid_File_Extra_Gallwwwback,
-	gid_File_Extra_Gallwwwgraf,
-	gid_File_Extra_Tpllayoutimpr,
-	gid_File_Extra_Tplwizbitmap,
-	gid_File_Extra_Tplwizletter,
-	gid_File_Scripts_Beanshell,
-	gid_File_Scripts_Java,
-	gid_File_Scripts_Java_jars,
-	gid_File_Scripts_Javascript,
-	gid_File_Basic_Access2Base,
-	gid_File_Basic_Depot,
-	gid_File_Basic_Euro,
-	gid_File_Basic_Form,
-	gid_File_Basic_Gimmicks,
-	gid_File_Basic_Importwiz,
-	gid_File_Basic_Formwiz,
-	gid_File_Basic_Scriptbindinglib,
-	gid_File_Basic_Template,
-	gid_File_Basic_Tools,
-	gid_File_Basic_Tutorials,
-	gid_File_Extra_Cfgsrv,
-	gid_File_sd_web,
-        gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
-        gid_File_Share_Config_Sofficecfg_uiconfig_cui,
-#ifdef DBCONNECTIVITY
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbapp,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbbrowser,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbquery,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbrelation,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbreport,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbtable,
-        gid_File_Share_Config_Sofficecfg_uiconfig_dbtdata,
-#endif
-        gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
-        gid_File_Share_Config_Sofficecfg_uiconfig_filter,
-        gid_File_Share_Config_Sofficecfg_uiconfig_formula,
-        gid_File_Share_Config_Sofficecfg_uiconfig_fps,
-#ifdef DBCONNECTIVITY
-        gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
-#endif
-        gid_File_Share_Config_Sofficecfg_uiconfig_scalc,
-        gid_File_Share_Config_Sofficecfg_uiconfig_schart,
-        gid_File_Share_Config_Sofficecfg_uiconfig_sdraw,
-        gid_File_Share_Config_Sofficecfg_uiconfig_sfx,
-        gid_File_Share_Config_Sofficecfg_uiconfig_sglobal,
-        gid_File_Share_Config_Sofficecfg_uiconfig_simpress,
-        gid_File_Share_Config_Sofficecfg_uiconfig_smath,
-        gid_File_Share_Config_Sofficecfg_uiconfig_startmodule,
-        gid_File_Share_Config_Sofficecfg_uiconfig_svt,
-        gid_File_Share_Config_Sofficecfg_uiconfig_svx,
-        gid_File_Share_Config_Sofficecfg_uiconfig_sweb,
-        gid_File_Share_Config_Sofficecfg_uiconfig_swform,
-        gid_File_Share_Config_Sofficecfg_uiconfig_swreport,
-        gid_File_Share_Config_Sofficecfg_uiconfig_swriter,
-        gid_File_Share_Config_Sofficecfg_uiconfig_swxform,
-#ifdef ENABLE_TELEPATHY
-        gid_File_Share_Config_Sofficecfg_uiconfig_tubes,
-#endif
-        gid_File_Share_Config_Sofficecfg_uiconfig_uui,
-        gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
-        gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
-	gid_File_framework_dtd,
-	gid_File_xmlscript_dtd,
-	gid_File_Dtd_Manifest,
-	gid_File_xmloff_dtd,
-	gid_File_officecfg_misc,
-    gid_File_Share_Glade_Xml,
-    gid_File_Share_Labels_Xml,
-    gid_File_Share_Registry_Main_Xcd,
-    gid_File_Share_Registry_Forcedefault_Xcd,
-	gid_File_Pymailmerge,
-	gid_File_Extra_Fontunxpsprint,
-	gid_File_Extra_Fontunxppds,
-	gid_File_Extra_Fontunxafm);
-End
-
-Module gid_Module_Root_Files_7
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "80";
-	Name = "gid_Module_Root_Files_7";
-	Description = "gid_Module_Root_Files_7";
-	Sortkey = "1900";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Help_Help_Zip);
-End
-
 #ifndef LIBO_HEADLESS
 Module gid_Module_Root_Files_Images
     PackageInfo = "packinfo_office.txt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 1d54adfb76ce..b93e6851a1ff 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -23,7 +23,156 @@ Module gid_Module_Root
     PackageInfo = "packinfo_office.txt";
     InstallOrder = "20";
     MOD_NAME_DESC(MODULE_ROOT_OSL);
-    XpdPackageName = "gid_Module_Root_Files_1";
+    Files = (gid_File_shell_scripts,
+             gid_File_Bin_Pluginapp,
+             gid_File_Bin_Senddoc,
+             gid_File_Script_Gengal,
+             gid_File_Bin_Uri_Encode,
+             gid_File_Bin_UIPreviewer,
+             gid_File_Txt_Pagein_Common,
+             gid_File_Txt_Pagein_Calc,
+             gid_File_Txt_Pagein_Draw,
+             gid_File_Txt_Pagein_Impress,
+             gid_File_Txt_Pagein_Writer,
+             gid_File_extras_newfiles,
+             gid_File_Jar_Letter,
+             gid_File_Wizards_Common,
+             gid_File_Wizards_Fax,
+             gid_File_Jar_Agenda,
+             gid_File_Jar_Web,
+             gid_File_Rdb_Offapi,
+             gid_Starregistry_Services_Rdb,
+             auto_ooo_ALL,
+             auto_ooobinarytable_ALL,
+             gid_File_Lib_Bib,
+             gid_File_Lib_J,
+             gid_File_Lib_Zip,
+             gid_Unixlink_File_Lib_Curl,
+             gid_File_Lib_Recentfile,
+             gid_File_Lib_Tab,
+             gid_File_Lib_Tab2,
+             gid_Unixlink_File_Lib_Raptor,
+             gid_Unixlink_File_Lib_Rasqal,
+             gid_Unixlink_File_Lib_Rdf,
+             gid_File_Lib_Sndfile,
+             gid_File_Lib_Neon,
+             gid_Unixlink_File_Lib_Xslt,
+             gid_Unixlink_File_Lib_eXslt,
+             gid_File_Lib_I18n,
+             gid_File_Lib_Accessbridge,
+             gid_File_Lib_Dl,
+             GID_FILE_LIB_WPD,
+             gid_File_Lib_Cli_Oootypes_Assembly,
+             gid_File_Lib_Policy_Cli_Oootypes_Assembly,
+             gid_File_Lib_Policy_Cli_Oootypes_Config,
+             gid_File_Basic_User,
+             gid_File_Basic_Share,
+             gid_File_Basic_User_Standard,
+             gid_File_Extra_Autotextuser,
+             gid_File_Extra_Cfgusr,
+             gid_File_Extra_Palettes,
+             gid_File_Extra_Database,
+             gid_File_Extra_Databasebiblio,
+             gid_File_Extra_Gallsound,
+             gid_File_Extra_Autocorr,
+             gid_File_Extra_Autocorr_Lang,
+             gid_File_Extra_Gallroot,
+             gid_File_Extra_Gallarrows,
+             gid_File_Extra_Gallcomputers,
+             gid_File_Extra_Galldiagrams,
+             gid_File_Extra_Galleducation,
+             gid_File_Extra_Gallenvironment,
+             gid_File_Extra_Gallfinance,
+             gid_File_Extra_Gallpeople,
+             gid_File_Extra_Gallsymbols,
+             gid_File_Extra_Galltransport,
+             gid_File_Extra_Galltxtshapes,
+             gid_File_Extra_Gallbullets,
+             gid_File_Extra_Gallhtmlexpo,
+             gid_File_Extra_Gallsystem,
+             gid_File_Extra_Gallsounds,
+             gid_File_Extra_Gallwwwback,
+             gid_File_Extra_Gallwwwgraf,
+             gid_File_Extra_Tpllayoutimpr,
+             gid_File_Extra_Tplwizbitmap,
+             gid_File_Extra_Tplwizletter,
+             gid_File_Scripts_Beanshell,
+             gid_File_Scripts_Java,
+             gid_File_Scripts_Java_jars,
+             gid_File_Scripts_Javascript,
+             gid_File_Basic_Access2Base,
+             gid_File_Basic_Depot,
+             gid_File_Basic_Euro,
+             gid_File_Basic_Form,
+             gid_File_Basic_Gimmicks,
+             gid_File_Basic_Importwiz,
+             gid_File_Basic_Formwiz,
+             gid_File_Basic_Scriptbindinglib,
+             gid_File_Basic_Template,
+             gid_File_Basic_Tools,
+             gid_File_Basic_Tutorials,
+             gid_File_Extra_Cfgsrv,
+             gid_File_sd_web,
+             gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
+             gid_File_Share_Config_Sofficecfg_uiconfig_cui,
+#ifdef DBCONNECTIVITY
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbapp,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbbrowser,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbquery,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbrelation,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbreport,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbtable,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbtdata,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
+             gid_File_Share_Config_Sofficecfg_uiconfig_filter,
+             gid_File_Share_Config_Sofficecfg_uiconfig_formula,
+             gid_File_Share_Config_Sofficecfg_uiconfig_fps,
+#ifdef DBCONNECTIVITY
+             gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_scalc,
+             gid_File_Share_Config_Sofficecfg_uiconfig_schart,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sdraw,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sfx,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sglobal,
+             gid_File_Share_Config_Sofficecfg_uiconfig_simpress,
+             gid_File_Share_Config_Sofficecfg_uiconfig_smath,
+             gid_File_Share_Config_Sofficecfg_uiconfig_startmodule,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svt,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svx,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sweb,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swform,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swreport,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swriter,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swxform,
+#ifdef ENABLE_TELEPATHY
+             gid_File_Share_Config_Sofficecfg_uiconfig_tubes,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_uui,
+             gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
+             gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
+             gid_File_framework_dtd,
+             gid_File_xmlscript_dtd,
+             gid_File_Dtd_Manifest,
+             gid_File_xmloff_dtd,
+             gid_File_officecfg_misc,
+             gid_File_Share_Glade_Xml,
+             gid_File_Share_Labels_Xml,
+             gid_File_Share_Registry_Main_Xcd,
+             gid_File_Share_Registry_Forcedefault_Xcd,
+             gid_File_Pymailmerge,
+             gid_File_Extra_Fontunxpsprint,
+             gid_File_Extra_Fontunxppds,
+             gid_File_Extra_Fontunxafm,
+             gid_File_Help_Help_Zip);
+    Unixlinks = (gid_Unixlink_File_Lib_Curl,
+                 gid_Unixlink_File_Lib_Raptor,
+                 gid_Unixlink_File_Lib_Rasqal,
+                 gid_Unixlink_File_Lib_Rdf,
+                 gid_Unixlink_File_Lib_Xslt,
+                 gid_Unixlink_File_Lib_eXslt);
 End
 
 Module gid_Module_Prg