[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

2019-04-04 Thread Jim Jagielski (via logerrit) 
 scp2/source/ooo/module_systemint.scp |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d06353475daf23b5afdaabf6784e0b7c26e8e350
Author: Jim Jagielski 
AuthorDate: Thu Apr 4 11:28:00 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Apr 4 11:28:00 2019 +

Merge r1856914 from trunk:

Reviewed by: jim

diff --git a/scp2/source/ooo/module_systemint.scp 
b/scp2/source/ooo/module_systemint.scp
index 684febdea109..dcb87b7130f3 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -36,7 +36,14 @@ Module gid_Module_Optional_Systemintegration
   #else
 Styles = 
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
   #endif
-  #if (defined(LINUX)) || (defined(SOLARIS))
+/*
+ * Hardcode name as 'openoffice' to handle Beta and Dev builds which
+ * would result in openoffice_beta, for example.
+ * See sysui/desktop/productversion.mk
+ */
+  #if (defined(LINUX))
+PackageName = "openoffice-desktop-integration.tar.gz";
+  #elif (defined(SOLARIS))
 PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
   #else
 PackageName = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util

2019-04-03 Thread Jim Jagielski (via logerrit) 
 instsetoo_native/util/openoffice.lst |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 17f80c1c474faef188849ba1b250c70e6c4f6d98
Author: Jim Jagielski 
AuthorDate: Wed Apr 3 19:25:50 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Apr 3 19:25:50 2019 +

Set ADDSYSTEMINTEGRATION for Beta and Dev builds

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1270bacb0657..51840e1da084 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -139,6 +139,7 @@ Apache_OpenOffice_Dev
REGISTRYLAYERNAME LayerDev
UPDATEURL 
https://ooo-updates.apache.org/aoonextdev/check.Update
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+   ADDSYSTEMINTEGRATION 1
EVAL
PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
@@ -354,7 +355,7 @@ Apache_OpenOffice_Beta
UPDATEURL 
https://ooo-updates.apache.org/aoonextbeta/check.Update
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-   ADDSYSTEMINTEGRATION 0
+   ADDSYSTEMINTEGRATION 1
EVAL
PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits