[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - scp2/source solenv/bin sysui/desktop

[Tor Lillqvist]

 scp2/source/ooo/directory_ooo_macosx.scp      |    2 +-
 solenv/bin/modules/installer/simplepackage.pm |    2 +-
 sysui/desktop/macosx/Info.plist               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d65198686137d0eed0777eb05adc19d329b16258
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Feb 10 17:29:01 2014 +0200

    Hardcode vendor-specific app bundle name
    
    Change-Id: Iee89a606e507f4356a62d5cd4ee2ebbed671bcdd

diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index fdc51f10..483be25 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -21,7 +21,7 @@
 #ifdef MACOSX
 Directory gid_Dir_Bundle
     ParentID = PD_PROGDIR;
-    HostName = "%PRODUCTNAME.app";
+    HostName = "LibreOffice from Collabora.app";
     LangPackHostName = "%PRODUCTNAME Language Pack.app";
 End
 
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 63a4c8b..b2ef9f4 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -270,7 +270,7 @@ sub create_package
 
         my $volume_name = $allvariables->{'PRODUCTNAME'};
         my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'};
-        my $volume_name_classic_app = $volume_name;  # "app" should not contain version number
+        my $volume_name_classic_app = 'LibreOffice from Collabora';  # "app" should not contain version number
         if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
             $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
             $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 5a682dc..9682cb0 100755
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1411,7 +1411,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCTNAME}</string>
+	<string>LibreOffice from Collabora</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>