This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 125a0d0d420c22cd43411019fa3b026830d0bfd5
Author: Rene Engelhard <r...@debian.org>
Date: Wed Sep 23 13:05:15 2015 +0200
remove -gtk3 from control and move into extra file as dak otherwise thinks
we need NEW
---
changelog | 5 ++++-
control | 15 ---------------
control.gtk3.in | 15 +++++++++++++++
control.in | 15 ---------------
rules | 4 +++-
5 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/changelog b/changelog
index 772bb1a..2f4b283 100644
--- a/changelog
+++ b/changelog
@@ -22,8 +22,11 @@ libreoffice (1:5.0.2-1) unstable; urgency=medium
gdb stuff
- re-enable coinmp; build-dependencies now installable again; bump
build-dependencies to the gcc 5 versions
+ * debian/control.{,gtk3.in}, debian/rules: move disabled -gtk3 into extra
+ file so tha it doesn't appear in control when disabled, makes dak think
+ it's NEW.
- -- Rene Engelhard <r...@debian.org> Sat, 19 Sep 2015 17:11:18 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 23 Sep 2015 13:03:10 +0200
libreoffice (1:5.0.1-2) unstable; urgency=medium
diff --git a/control b/control
index 7add20d..62040f6 100644
--- a/control
+++ b/control
@@ -692,21 +692,6 @@ Description: office productivity suite -- GTK+ integration
under GNOME. It also contains a QuickStarter for the "notification area"
and a (basic) GTK+ document viewer widget.
-Package: libreoffice-gtk3
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
-Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: libreoffice-style-tango
-Section: gnome
-Enhances: libreoffice
-Description: office productivity suite -- GTK+ 3.0 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+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
-
Package: libreoffice-gnome
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: gconf2,
diff --git a/control.gtk3.in b/control.gtk3.in
new file mode 100644
index 0000000..c6619bc
--- /dev/null
+++ b/control.gtk3.in
@@ -0,0 +1,15 @@
+Package: libreoffice-gtk3
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: libreoffice-style-tango
+Section: gnome
+Enhances: libreoffice
+Description: office productivity suite -- GTK+ 3.0 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+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
+
diff --git a/control.in b/control.in
index 34db63c..d1d32d6 100644
--- a/control.in
+++ b/control.in
@@ -527,21 +527,6 @@ Description: office productivity suite -- GTK+ integration
under GNOME. It also contains a QuickStarter for the "notification area"
and a (basic) GTK+ document viewer widget.
-Package: libreoffice-gtk3
-Architecture: %OOO_ARCHS%
-Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: libreoffice-style-tango
-Section: gnome
-Enhances: libreoffice
-Description: office productivity suite -- GTK+ 3.0 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+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
-
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
Depends: gconf2,
diff --git a/rules b/rules
index 624980b..32fa894 100755
--- a/rules
+++ b/rules
@@ -1297,7 +1297,6 @@ ifeq "$(BUILD_GTK3)" "y"
endif
GNOME_GTK_DEPENDS += libreoffice-gtk3
else
- DEBHELPER_OPTIONS+= -Nlibreoffice-gtk3
GNOME_GTK_DEPENDS += libreoffice-gtk
endif
@@ -1743,6 +1742,9 @@ endif
ifeq "$(PACKAGE_LOKIT)" "y"
cat debian/control.lokit.in >> debian/control
endif
+ifeq "$(BUILD_GTK3)" "y"
+ cat debian/control.gtk3.in >> debian/control
+endif
ifeq "$(BUILD_KDE)" "y"
cat debian/control.kde.in >> debian/control
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
