[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-1' - desktop/Package_scripts.mk RepositoryFixes.mk scp2/source

[Stephan Bergmann]

 RepositoryFixes.mk               |    2 +-
 desktop/Package_scripts.mk       |    2 +-
 scp2/source/ooo/common_brand.scp |   13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 06975a6e3a253ed8d4817fac96f6d175800b5d09
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 9 18:06:48 2015 +0100

    On Mac OS X, directly name the executable "unopkg"
    
    Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2
    (cherry picked from commit 57e6d742a9e2aeb11b179122991e7d35ca54543c)
    Reviewed-on: https://gerrit.libreoffice.org/14399
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6023b04..7500e2f 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -25,7 +25,7 @@ gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
 ifneq (,$(filter-out MACOSX WNT,$(OS)))
 gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
 endif
-gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg$(if $(filter-out MACOSX,$(OS)),.bin),$(gb_Executable_FILENAMES))
 gb_Executable_FILENAMES := $(patsubst unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES))
 gb_Executable_FILENAMES := $(patsubst crashrep_com:crashrep_com%,crashrep_com:crashrep.com,$(gb_Executable_FILENAMES))
 gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 3c86abe..a806c72 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -12,13 +12,13 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
 ifeq (,$(filter MACOSX WNT,$(OS)))
 
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
 ifneq ($(OS),WNT)
 
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,$(if $(filter MACOSX,$(OS)),unoinfo-mac.sh,unoinfo.sh)))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a866929..8d16452 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -89,9 +89,6 @@ Module gid_Module_Root_Brand
 	     git_License_Odt,
 	     gid_Credits_Odt,
 	     gid_Apache_Notice);
-#if defined MACOSX
-    Unixlinks = (gid_Brand_Unixlink_Unopkg);
-#endif
 End
 
 // Language specific brand module
@@ -535,16 +532,6 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-#if defined MACOSX
-Unixlink gid_Brand_Unixlink_Unopkg
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "unopkg";
-    Target = "unopkg.bin";
-    Styles = ();
-End
-#endif
-
 File gid_Brand_File_Bmp_IntroAboutShell
     TXT_FILE_BODY;
     Dir = FILELIST_DIR;