[libreoffice] 02/02: remove mention of Quickstarter also from -gtk2; install it into a new -systray package (if enabled)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 3566efdd9815778b62ba50d12704795ca872ba7a
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 8 13:18:47 2016 +0200
remove mention of Quickstarter also from -gtk2; install it into a new -systray package (if enabled)
---
changelog | 10 +++++++---
control | 23 ++++++++++++++++++++++-
control.gtk2.in | 21 +++++++++++++++++++++
control.in | 21 ---------------------
control.systray.in | 11 +++++++++++
rules | 13 ++++++++++---
6 files changed, 71 insertions(+), 28 deletions(-)
diff --git a/changelog b/changelog
index 9f0afee..b00e246 100644
--- a/changelog
+++ b/changelog
@@ -5,9 +5,13 @@ libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
* debian/rules, debian/shlibs.override.libcmis: bump libcmis dependency
to (>= 0.5.1+git20160603) to assure the advertised google 2-factor-auth
stuff is present
- * debian/control.in: update libroffice-gtk mentioning in libreoffice's
- description to say gtk(2|3) (closes: #833694) -thanks Vincent Levebre;
- remove mention of Quickstarter,
+ * debian/control.in:
+ - update libroffice-gtk mentioning in libreoffice's
+ description to say gtk(2|3) (closes: #833694) - thanks Vincent Levebre
+ - remove mention of Quickstarter from libreoffice and libreoffice-gtk2
+ descriptions; gone there since some time
+ * debian/control.systray.in, debian/rules: install the systray stuff into a
+ new -systray package (if enabled)
-- Rene Engelhard <rene@debian.org> Mon, 08 Aug 2016 07:25:15 +0200
diff --git a/control b/control
index 1adb943..34ba130 100644
--- a/control
+++ b/control
@@ -713,7 +713,7 @@ Description: office productivity suite -- GTK+ 2 integration
.
This package contains the Gtk plugin for drawing LibreOffices widgets
with Gtk+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
- under GNOME. It also contains a QuickStarter for the "notification area".
+ under GNOME.
Package: libreoffice-gnome
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
@@ -4449,6 +4449,27 @@ Description: LibreOfficeKit -- headers
.
This package contains the headers needed for using LibreOfficeKit.
+Package: libreoffice-gtk2
+Architecture: %OOO_ARCHS%
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+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]
+Description: office productivity suite -- GTK+ 2 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
+ under GNOME.
+
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
new file mode 100644
index 0000000..8f1c118
--- /dev/null
+++ b/control.gtk2.in
@@ -0,0 +1,21 @@
+Package: libreoffice-gtk2
+Architecture: %OOO_ARCHS%
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+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]
+Description: office productivity suite -- GTK+ 2 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
+ under GNOME.
+
diff --git a/control.in b/control.in
index ab65e84..946ccca 100644
--- a/control.in
+++ b/control.in
@@ -526,27 +526,6 @@ Description: office productivity suite -- Galaxy (Default) symbol style
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreoffice-gtk2
-Architecture: %OOO_ARCHS%
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-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]
-Description: office productivity suite -- GTK+ 2 integration
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the Gtk plugin for drawing LibreOffices widgets
- with Gtk+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
- under GNOME. It also contains a QuickStarter for the "notification area".
-
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
Pre-Depends: ${misc:Pre-Depends}
diff --git a/control.systray.in b/control.systray.in
new file mode 100644
index 0000000..8c08ad8
--- /dev/null
+++ b/control.systray.in
@@ -0,0 +1,11 @@
+Package: libreoffice-systray
+Section: misc
+Priority: extra
+Description: office productivity suite -- "Quickstarter" for Desktop notification area
+Replaces: libreoffice-gtk (<< 1:5.1.2-3), libreoffice-common (<< 1:5.1.2-3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libreoffice-gtk2
+ 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.
+
diff --git a/rules b/rules
index a6788cc..4301347 100755
--- a/rules
+++ b/rules
@@ -1800,6 +1800,12 @@ endif
ifeq "$(PACKAGE_LOKIT)" "y"
cat debian/control.lokit.in >> debian/control
endif
+ifeq "$(BUILD_GTK)" "y"
+ cat debian/control.gtk2.in >> debian/control
+endif
+ifeq "$(ENABLE_SYSTRAY)" "y"
+ cat debian/control.systray.in >> debian/control
+endif
ifeq "$(BUILD_GTK3)" "y"
cat debian/control.gtk3.in >> debian/control
endif
@@ -2269,9 +2275,9 @@ endif
ifeq "$(BUILD_GTK)" "y"
ifeq "$(ENABLE_SYSTRAY)" "y"
# Gtk quickstarter, so to -gtk (via -gnome)
- mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/share/xdg
+ mkdir -p -m755 $(PKGDIR)-systray/$(OODIR)/share/xdg
mv $(PKGDIR)-common/$(OODIR)/share/xdg/qstart.desktop \
- $(PKGDIR)-gnome/$(OODIR)/share/xdg
+ $(PKGDIR)-systray/$(OODIR)/share/xdg
endif
endif
@@ -2643,7 +2649,8 @@ endif
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/share
ifeq "$(ENABLE_SYSTRAY)" "y"
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk2/$(OODIR)/share
+ mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-systray/$(OODIR)/share
+ mv $(PKGDIR)-gnome/$(OODIR)/program/*qstart*so $(PKGDIR)-systray/$(OODIR)/share
endif
ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: