[libreoffice] 03/05: add -gtk transitional package; reenable systray
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 9287282e7501487ab9e2a690a88e1022a26b148e
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 15 11:11:41 2016 +0200
add -gtk transitional package; reenable systray
---
changelog | 7 +++++++
control | 27 ++++++++++++++++++++++++++-
control.gtk2.in | 1 -
control.transitionals.in | 14 ++++++++++++++
rules | 3 ++-
5 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index d20514d..7e12440 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,13 @@ libreoffice (1:5.2.1~rc1-1) UNRELEASED; urgency=medium
* new upstream release candidate
+ * debian/rules, debian/control.transitionals.in: readd -gtk as transitional
+ package; depend on -gtk2 (closes: #833676), recommend -systray only
+ * debian/rules: reeneble systray (closes: #825642) now that we need
+ NEW anyway and have a -gtk transitional package (which contained this
+ before it was disabled)
+ * debian/control.gtk2.in: stop providing libreoffice-gtk
+
-- Rene Engelhard <rene@debian.org> Thu, 11 Aug 2016 20:30:24 +0200
libreoffice (1:5.2.0-3) UNRELEASED; urgency=medium
diff --git a/control b/control
index 772303d..c6089f5 100644
--- a/control
+++ b/control
@@ -4439,7 +4439,6 @@ Depends: libreoffice-core (= ${binary:Version}),
Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
-Provides: libreoffice-gtk
Replaces: libreoffice-gtk (<< 1:5.2.0~)
Breaks: libreoffice-gtk (<< 1:5.2.0~)
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
@@ -4451,6 +4450,32 @@ 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-gtk
+Architecture: all
+Section: gnome
+Priority: extra
+Recommends: libreoffice-systray
+Depends: libreoffice-gtk2
+Description: transitional package to upgrade to libreoffice-gtk2
+ This package used to contain the Gtk2 integration for LibreOffice.
+ .
+ It has been renamed to libreoffice-gtk2 (and the systray/"Quickstarter"
+ split out to libreoffice-systray.
+ .
+ You can safely remove this package.
+
+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: extra
+Replaces: libreoffice-common (<< 1:5.1.2-3), libreoffice-gtk (<< 1:5.1.2-3)
+Depends: libreoffice-gtk2, ${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
Pre-Depends: ${misc:Pre-Depends}
diff --git a/control.gtk2.in b/control.gtk2.in
index 8f1c118..91db4cc 100644
--- a/control.gtk2.in
+++ b/control.gtk2.in
@@ -7,7 +7,6 @@ Depends: libreoffice-core (= ${binary:Version}),
Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
-Provides: libreoffice-gtk
Replaces: libreoffice-gtk (<< 1:5.2.0~)
Breaks: libreoffice-gtk (<< 1:5.2.0~)
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
diff --git a/control.transitionals.in b/control.transitionals.in
new file mode 100644
index 0000000..f33922c
--- /dev/null
+++ b/control.transitionals.in
@@ -0,0 +1,14 @@
+Package: libreoffice-gtk
+Architecture: all
+Section: gnome
+Priority: extra
+Recommends: libreoffice-systray
+Depends: libreoffice-gtk2
+Description: transitional package to upgrade to libreoffice-gtk2
+ This package used to contain the Gtk2 integration for LibreOffice.
+ .
+ It has been renamed to libreoffice-gtk2 (and the systray/"Quickstarter"
+ split out to libreoffice-systray.
+ .
+ You can safely remove this package.
+
diff --git a/rules b/rules
index 8fd1166..93e7417 100755
--- a/rules
+++ b/rules
@@ -390,7 +390,7 @@ else
endif
ENABLE_SDBC_POSTGRESQL=y
BUILD_GTK=y
-ENABLE_SYSTRAY=n
+ENABLE_SYSTRAY=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
@@ -1807,6 +1807,7 @@ ifeq "$(PACKAGE_LOKIT)" "y"
endif
ifeq "$(BUILD_GTK)" "y"
cat debian/control.gtk2.in >> debian/control
+ cat debian/control.transitionals.in >> debian/control
endif
ifeq "$(ENABLE_SYSTRAY)" "y"
cat debian/control.systray.in >> debian/control
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: