From 16a87cb29ec007ae7bed8d4116f1d6e3dd36a175 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 2 Mar 2016 17:28:43 +0100 Subject: shell, scp2: clean up empty script packages Change-Id: I93abddac491578d470f85bf3e814a0d7a91f0351 --- scp2/source/kde/module_kde.scp | 4 +--- scp2/source/ooo/file_ooo.scp | 25 ------------------------- scp2/source/ooo/module_ooo.scp | 3 +-- scp2/source/tde/module_tde.scp | 4 +--- 4 files changed, 3 insertions(+), 33 deletions(-) (limited to 'scp2') diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 2bf6ac58d0c3..6fa6155b6b16 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -26,7 +26,5 @@ Module gid_Module_Optional_Kde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); - Files = (auto_kde_ALL, - gid_File_Bin_Kde_Open_Url - ); + Files = (auto_kde_ALL); End diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b98ed64c69c4..ce009ddd99ac 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -59,31 +59,6 @@ End #endif -#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS - -File gid_File_shell_scripts - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_scripts.filelist"; - Styles = (FILELIST, PACKED); -End - -File gid_File_Bin_Kde_Open_Url - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_scripts_kde.filelist"; - Styles = (FILELIST, PACKED); -End - -File gid_File_Bin_Tde_Open_Url - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_scripts_tde.filelist"; - Styles = (FILELIST, PACKED); -End - -#endif - #if defined UNX File gid_File_Bin_Senddoc BIN_FILE_BODY; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index e975fe8c436f..35fd16c79d05 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -23,8 +23,7 @@ Module gid_Module_Root PackageInfo = "packinfo_office.txt"; InstallOrder = "20"; MOD_NAME_DESC(MODULE_ROOT_OSL); - Files = (gid_File_shell_scripts, - gid_File_Bin_Senddoc, + Files = (gid_File_Bin_Senddoc, gid_File_Script_Gengal, gid_File_Txt_Pagein_Common, gid_File_Txt_Pagein_Calc, diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 8e273ab9385a..24725de25303 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -19,8 +19,6 @@ Module gid_Module_Optional_Tde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); - Files = (auto_tde_ALL, - gid_File_Bin_Tde_Open_Url - ); + Files = (auto_tde_ALL); End -- cgit