From bfc1108958d77aca6462f5c6b8ba097fd5f5a264 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 30 Oct 2013 14:45:09 +0100 Subject: setup_native: remove root[345].dat These dummy files were apparently added for i#73345 to prevent issues from dpkg when some core-0[345] package was empty; these packages are never empty nowadays. Change-Id: I58f03677473a594f03a51d0440095bdf4a6ea3fd --- scp2/source/ooo/file_ooo.scp | 27 --------------------------- setup_native/Package_misc.mk | 3 --- setup_native/source/linux/root3.dat | 4 ---- setup_native/source/linux/root4.dat | 4 ---- setup_native/source/linux/root5.dat | 4 ---- 5 files changed, 42 deletions(-) delete mode 100644 setup_native/source/linux/root3.dat delete mode 100644 setup_native/source/linux/root4.dat delete mode 100644 setup_native/source/linux/root5.dat diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ec76fac19682..b2b8d054c29c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -701,33 +701,6 @@ File gid_Starregistry_Services_Rdb Styles = (PACKED); End -#ifdef LINUX -File gid_File_Dat_Root3 - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "root3.dat"; - Styles = (PACKED); -End -#endif - -#ifdef LINUX -File gid_File_Dat_Root4 - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "root4.dat"; - Styles = (PACKED); -End -#endif - -#ifdef LINUX -File gid_File_Dat_Root5 - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "root5.dat"; - Styles = (PACKED); -End -#endif - #ifdef MACOSX File gid_File_App_InfoPlist TXT_FILE_BODY; diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index f7cfa5b24fa6..48b87d462d9e 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -17,9 +17,6 @@ $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_ $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Dev,mac/ooo/DS_Store_Dev)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Langpack,mac/ooo/DS_Store_Langpack)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/osxdndinstall.png,mac/ooo/osxdndinstall.png)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/root3.dat,linux/root3.dat)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/root4.dat,linux/root4.dat)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/root5.dat,linux/root5.dat)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/source/linux/root3.dat b/setup_native/source/linux/root3.dat deleted file mode 100644 index 13ba57793426..000000000000 --- a/setup_native/source/linux/root3.dat +++ /dev/null @@ -1,4 +0,0 @@ -Base file in core03 package. -Never include into patch. - - diff --git a/setup_native/source/linux/root4.dat b/setup_native/source/linux/root4.dat deleted file mode 100644 index 7f99a3d8004d..000000000000 --- a/setup_native/source/linux/root4.dat +++ /dev/null @@ -1,4 +0,0 @@ -Base file in core04 package. -Never include into patch. - - diff --git a/setup_native/source/linux/root5.dat b/setup_native/source/linux/root5.dat deleted file mode 100644 index a3a9f6178bd5..000000000000 --- a/setup_native/source/linux/root5.dat +++ /dev/null @@ -1,4 +0,0 @@ -Base file in core05 package. -Never include into patch. - - -- cgit