scp2/source/ooo/common_brand.scp | 6 ------ scp2/source/ooo/file_ooo.scp | 16 ++-------------- scp2/source/ooo/module_lang_template.scp | 3 +-- 3 files changed, 3 insertions(+), 22 deletions(-)
New commits: commit f0b57c30fdb5ecdd25879844159b9038399bc6de Author: Stephan Bergmann <[email protected]> Date: Wed Sep 11 13:59:01 2013 +0200 Info.plist et al were no longer found when creating a .dmg Change-Id: I898fd9e3ada84a52bd6305314f8b80db0254b3fc diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 7679da7..11416d6 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -721,19 +721,11 @@ End #endif #ifdef MACOSX -File gid_File_App_PkgInfo - TXT_FILE_BODY; - Dir = gid_Dir_Bundle_Contents; - Name = "PkgInfo"; -End -#endif - -#ifdef MACOSX File gid_File_App_InfoPlist TXT_FILE_BODY; Dir = gid_Dir_Bundle_Contents; - Name = "Info.plist"; - Styles = (SCPZIP_REPLACE); + Name = "infoplist.filelist"; + Styles = (FILELIST); End #endif @@ -756,10 +748,6 @@ End #endif #ifdef MACOSX -ITERATE_ALL_LANG_FILE(InfoPlist_Lang,Bundle_Contents_Resources_Lang,ARCHIVE_TXT_FILE_BODY,InfoPlist,.zip) -#endif - -#ifdef MACOSX File gid_File_Spotlight_Bundle TXT_FILE_BODY; Dir = FILELIST_DIR; diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 0780b17..63f4169 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -52,8 +52,7 @@ Module gid_Module_Langpack_Basis_Template gid_File_Registry_Lang, gid_File_Registry_Spool_Langpack_Lang, gid_File_Share_Registry_Ctl_Xcd, - gid_File_Share_Registry_Ctlseqcheck_Xcd, - gid_File_InfoPlist_Lang); + gid_File_Share_Registry_Ctlseqcheck_Xcd); Dirs = (gid_Dir_Samples_Language, gid_Dir_Autotext_Language); End commit d77dc4381d876fc1e97ce8142dfd26ad52ebaa35 Author: Stephan Bergmann <[email protected]> Date: Wed Sep 11 13:57:13 2013 +0200 It's plain "soffice" on Mac OS X now ...since 07ec7b1c2ad558b5835ba6cfd69a6e69ebfd9bfe "soffice.bin is named soffice on Mac OS X." Change-Id: I4a4e64565dc4f3553648bf96ef43b558f757c852 diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index cf59e9d..f19f83e 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -514,14 +514,8 @@ End File gid_Brand_File_Bin_Soffice BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; -#if defined MACOSX - Name = "soffice.bin"; - InstallName = "soffice"; - Styles = (PACKED, SUBST_FILENAME); -#else Name = EXENAME(soffice); Styles = (PACKED); -#endif End #endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
