[libreoffice] 02/03: stop building -systray again

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit a74b89aed3803306d2098d2652974b482ca61991
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Sep 9 19:36:09 2017 +0200

    stop building -systray again
---
 changelog |  7 ++++++-
 control   | 14 +-------------
 rules     |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/changelog b/changelog
index 1688263..9653a2f 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170830-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170903-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
@@ -6,6 +6,11 @@ libreoffice (1:6.0.0~alpha0~git20170830-1) UNRELEASED; urgency=medium
   * merge from Ubuntu, thanks Rico Tzschichholz:
     - Add "elementary" style package
 
+  * debian/rules:
+    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
+      and in 6.0 the feature is not completely removed yet but the UI for
+      setting it is already gone anyway....
+
   [ Rico Tzschichholz ]
   * Add Kannada (kn) langpack
 
diff --git a/control b/control
index 4d9b18c..7d30dc4 100644
--- a/control
+++ b/control
@@ -191,7 +191,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 4.0.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs: 
+Bugs: mailto:debian-openoffice at lists.debian.org
 Homepage: http://www.libreoffice.org
 
 Package: libreoffice
@@ -4240,18 +4240,6 @@ Description: office productivity suite -- GTK+ 2 integration
  with Gtk+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
  under GNOME.
 
-Package: libreoffice-systray
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Section: misc
-Priority: optional
-Replaces: libreoffice-common (<< 1:5.1.2-3), libreoffice-gtk (<< 1:5.1.2-3)
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: LibreOffice "Quickstarter" for the desktop notification area
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package provides a "QuickStarter" for the notification area of desktops.
-
 Package: libreoffice-gtk3
 Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
 Depends: libreoffice-core (= ${binary:Version}),
diff --git a/rules b/rules
index 0d97c0c..d7632a0 100755
--- a/rules
+++ b/rules
@@ -387,7 +387,7 @@ else
 endif
 ENABLE_SDBC_POSTGRESQL=y
 BUILD_GTK=y
-ENABLE_SYSTRAY=y
+ENABLE_SYSTRAY=n
 #ifeq "$(DEB_DISTRIBUTION)" "experimental"
 BUILD_GTK3=y
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git