scp2/source/ooo/directory_ooo_macosx.scp | 2 +-
solenv/bin/modules/installer/simplepackage.pm | 6 +++---
sysui/desktop/macosx/Info.plist.in | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d223659093f487ffc44e2fd00f3efa69d39a6c55
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 5 19:23:47 2014 +0300
Revert "Collabora branding"
Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.
This reverts commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7.
Change-Id: I6b0e1c9a460acfe0304e9bafa5f2114e177bbe50
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp
b/scp2/source/ooo/directory_ooo_macosx.scp
index 7d697ec..0bc7bfd 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 = "LibreOffice from Collabora.app";
+ HostName = "%PRODUCTNAME.app";
End
Directory gid_Dir_Bundle_Contents
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 35793a3..9c61d66 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 = 'LibreOffice from Collabora'; # "app"
should not contain version number
+ my $volume_name_classic_app = $volume_name; # "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'};
@@ -411,10 +411,10 @@ sub create_package
}
else
{
- if (($volume_name_classic_app eq 'LibreOffice from Collabora' ||
$volume_name_classic_app eq 'LibreOfficeDev') &&
+ if (($volume_name_classic_app eq 'LibreOffice' ||
$volume_name_classic_app eq 'LibreOfficeDev') &&
defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) &&
$ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
{
- $systemcall =
"$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle
\"$localtempdir/$folder/$volume_name_classic_app.app\"";
+ $systemcall =
"$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle
$localtempdir/$folder/$volume_name_classic_app.app";
print "... $systemcall ...\n";
my $returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 2d88882..16f9eae 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1411,7 +1411,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>LibreOffice from Collabora</string>
+ <string>@PRODUCTNAME@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
commit a2fde7c953e5f085e2b696cea1e243c649cf6a86
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 5 19:23:13 2014 +0300
Revert "This one, too"
Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.
This reverts commit e20640b9592c873169d25869076982a4d5628116.
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 49b3631..2d88882 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1401,7 +1401,7 @@
<key>CFBundleExecutable</key>
<string>soffice</string>
<key>CFBundleGetInfoString</key>
- <string>LibreOffice from Collabora
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string>
+ <string>@PRODUCTNAME@
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string>
<key>CFBundleIconFile</key>
<string>main.icns</string>
<key>CFBundleShortVersionString</key>
commit ff23056752efd99e79d7b328c3df83116e7d81d0
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 5 00:21:59 2014 +0300
This one, too
Change-Id: Ic2c724f39bd71ab181b33532d1ed2f0bcf8f82bd
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 2d88882..49b3631 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1401,7 +1401,7 @@
<key>CFBundleExecutable</key>
<string>soffice</string>
<key>CFBundleGetInfoString</key>
- <string>@PRODUCTNAME@
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string>
+ <string>LibreOffice from Collabora
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string>
<key>CFBundleIconFile</key>
<string>main.icns</string>
<key>CFBundleShortVersionString</key>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
