This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 72a78610df64c7eed677c447b756c8bbd961ef96
Author: Rene Engelhard <r...@debian.org>
Date: Mon Apr 11 18:55:48 2016 +0200
don't install qstart.desktop if it's disabled
---
changelog | 7 ++++
...-t-install-qstart.desktop-if-it-s-disabled.diff | 40 ++++++++++++++++++++++
patches/series | 1 +
3 files changed, 48 insertions(+)
diff --git a/changelog b/changelog
index 6162c7d..10a5f39 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.1.2-3) unstable; urgency=medium
+
+ * debian/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff:
+ as name says (closes: #820657)
+
+ -- Rene Engelhard <r...@debian.org> Mon, 11 Apr 2016 18:54:00 +0200
+
libreoffice (1:5.1.2-2) unstable; urgency=medium
* debian/rules:
diff --git a/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff
b/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff
new file mode 100644
index 0000000..fa08a69
--- /dev/null
+++ b/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff
@@ -0,0 +1,40 @@
+From 2f48e8f808675cc8eae9ac234bb8641e44ee7537 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <r...@debian.org>
+Date: Mon, 11 Apr 2016 09:56:23 +0200
+Subject: [PATCH] don't install qstart.desktop if it's disabled
+ (--disable-systray)
+
+Change-Id: I21a53381ad4018034de3833e8e244d0d7a7d28b8
+---
+ scp2/InstallModule_ooo.mk | 1 +
+ scp2/source/ooo/common_brand.scp | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
+index d54ca2e..35db721 100644
+--- a/scp2/InstallModule_ooo.mk
++++ b/scp2/InstallModule_ooo.mk
+@@ -19,6 +19,7 @@
+
+ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
+ ENABLE_GTK \
++ ENABLE_SYSTRAY_GTK \
+ ENABLE_MACOSX_SANDBOX \
+ ENABLE_NPAPI_FROM_BROWSER \
+ ENABLE_ONLINE_UPDATE \
+diff --git a/scp2/source/ooo/common_brand.scp
b/scp2/source/ooo/common_brand.scp
+index 3bf3c91..7cd7733 100644
+--- a/scp2/source/ooo/common_brand.scp
++++ b/scp2/source/ooo/common_brand.scp
+@@ -609,7 +609,7 @@ End
+ #endif
+
+ #if defined UNX && ! defined MACOSX
+-#ifdef ENABLE_GTK
++#ifdef ENABLE_SYSTRAY_GTK
+ File gid_Brand_File_Share_Xdg_QStart
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Xdg;
+--
+2.1.4
+
diff --git a/patches/series b/patches/series
index a1eefa8..4feacd0 100644
--- a/patches/series
+++ b/patches/series
@@ -38,3 +38,4 @@ no-packagekit-per-default.diff
setsdkenv-tripplet.diff
sdkname-lo.diff
liborcus-0.11.diff
+don-t-install-qstart.desktop-if-it-s-disabled.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
