[libreoffice] 04/05: rename -gtk to -gtk2
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 3ee138823257ea7cac6d04b9f41c458b5406e00f
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 22 07:56:10 2016 +0100
rename -gtk to -gtk2
---
changelog | 2 ++
control | 13 ++++++++-----
control.gtk3.in | 4 ++--
control.in | 9 ++++++---
libreoffice-gtk.lintian-overrides | 1 -
libreoffice-gtk.maintscript | 1 -
libreoffice-gtk2.lintian-overrides | 1 +
rules | 20 ++++++++++----------
8 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/changelog b/changelog
index 868df8f..41065a5 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:5.2.0~alpha1~git20160321-1) UNRELEASED; urgency=medium
liblibreofficekitgtk.so into an own package, as we have
libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
-- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
diff --git a/control b/control
index 391676d..9d0e169 100644
--- a/control
+++ b/control
@@ -675,7 +675,7 @@ 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-gtk
+Package: libreoffice-gtk2
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
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
@@ -683,13 +683,16 @@ 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]
-Description: office productivity suite -- GTK+ integration
+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+ and a Gtk/GNOMEish File Picker and print dialog when running
+ 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
@@ -4266,12 +4269,12 @@ Recommends: libreoffice-style-tango
Suggests: libreofficekit-data
Section: gnome
Enhances: libreoffice
-Description: office productivity suite -- GTK+ 3.0 integration
+Description: office productivity suite -- GTK+ 3 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.
+ with Gtk+ 3 and Gtk/GNOMEish print dialog when running under GNOME.
Package: gir1.2-lokdocview-0.1
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
diff --git a/control.gtk3.in b/control.gtk3.in
index 6e4a5ae..20c1a82 100644
--- a/control.gtk3.in
+++ b/control.gtk3.in
@@ -7,12 +7,12 @@ Recommends: libreoffice-style-tango
Suggests: libreofficekit-data
Section: gnome
Enhances: libreoffice
-Description: office productivity suite -- GTK+ 3.0 integration
+Description: office productivity suite -- GTK+ 3 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.
+ with Gtk+ 3 and Gtk/GNOMEish print dialog when running under GNOME.
Package: gir1.2-lokdocview-0.1
Architecture: %OOO_ARCHS%
diff --git a/control.in b/control.in
index 7920fa3..11d3c5e 100644
--- a/control.in
+++ b/control.in
@@ -510,7 +510,7 @@ 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-gtk
+Package: libreoffice-gtk2
Architecture: %OOO_ARCHS%
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
@@ -518,13 +518,16 @@ 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]
-Description: office productivity suite -- GTK+ integration
+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+ and a Gtk/GNOMEish File Picker and print dialog when running
+ 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
diff --git a/libreoffice-gtk.lintian-overrides b/libreoffice-gtk.lintian-overrides
deleted file mode 100644
index 46e1412..0000000
--- a/libreoffice-gtk.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libreoffice-gtk: binary-or-shlib-defines-rpath
diff --git a/libreoffice-gtk.maintscript b/libreoffice-gtk.maintscript
deleted file mode 100644
index 782307e..0000000
--- a/libreoffice-gtk.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/libreoffice-gtk /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE
diff --git a/libreoffice-gtk2.lintian-overrides b/libreoffice-gtk2.lintian-overrides
new file mode 100644
index 0000000..9c0dd9e
--- /dev/null
+++ b/libreoffice-gtk2.lintian-overrides
@@ -0,0 +1 @@
+libreoffice-gtk2: binary-or-shlib-defines-rpath
diff --git a/rules b/rules
index 7236451..f34ab8e 100755
--- a/rules
+++ b/rules
@@ -1317,7 +1317,7 @@ endif
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
- DEBHELPER_OPTIONS+= -Nlibreoffice-gtk -Nlibreoffice-gnome
+ DEBHELPER_OPTIONS+= -Nlibreoffice-gtk2 -Nlibreoffice-gnome
else
BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
endif
@@ -1335,7 +1335,7 @@ ifeq "$(BUILD_GTK3)" "y"
endif
else
CONFIGURE_FLAGS+= --disable-gtk3
- GNOME_GTK_DEPENDS += libreoffice-gtk
+ GNOME_GTK_DEPENDS += libreoffice-gtk2
endif
ifeq "$(ENABLE_EVO2)" "n"
@@ -2559,8 +2559,8 @@ ifeq "$(BUILD_KDE)" "y"
endif
# split out gtk stuff
- rm -rf $(PKGDIR)-gtk
- mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
+ rm -rf $(PKGDIR)-gtk2
+ mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/program
ifeq "$(BUILD_GTK3)" "y"
rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
@@ -2568,19 +2568,19 @@ ifeq "$(BUILD_GTK3)" "y"
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so debian/liblibreofficekitgtk/$(OODIR)/program/
endif
- mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
+ mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk2/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
- mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/share
+ mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk2/$(OODIR)/share
ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
+ mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
endif
ifeq "$(ENABLE_EVO2)" "y"
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
- mv $(PKGDIR)-gtk/$(OODIR)/program/libevoab*.so $(PKGDIR)-evolution/$(OODIR)/program
+ mv $(PKGDIR)-gtk2/$(OODIR)/program/libevoab*.so $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/share/registry/evoab.xcd \
$(PKGDIR)-evolution/$(OODIR)/share/registry
# FIXME: When the rdb is correctly generated, move here, too.
@@ -2621,7 +2621,7 @@ endif
for i in writer calc impress draw math base; do \
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop; \
done
- perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
+ perl -pi -e 's/Application;//' $(PKGDIR)-gtk2/$(OODIR)/share/xdg/qstart.desktop
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: