[libreoffice] 02/03: liblibreofficekitgtk.so is for gtk3 now
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit dc4f57424b49c8bd9d336180e70656db4f92d310
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 12 23:22:13 2015 +0200
liblibreofficekitgtk.so is for gtk3 now
---
changelog | 1 +
control | 23 +++++++++++++++++++----
control.in | 6 +++---
rules | 2 +-
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/changelog b/changelog
index f250b7d..f29e85a 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,7 @@ libreoffice (1:5.1.0~alpha1~git20150904-1) UNRELEASED; urgency=medium
- remove upstream gone kdeab and gnome-vfs options
* debian/control*.in, debian/rules:
- package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+ - move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
-- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
diff --git a/control b/control
index c41d33d..53c9792 100644
--- a/control
+++ b/control
@@ -29,6 +29,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64eb],
gcj-native-helper [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
gdb,
gettext,
+ gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
@@ -684,15 +685,13 @@ Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
-Replaces: libreoffice-core (<< 1:5.0.2~rc1)
Description: office productivity suite -- GTK+ 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
- under GNOME. It also contains a QuickStarter for the "notification area"
- and a (basic) GTK+ document viewer widget.
+ under GNOME. It also contains a QuickStarter for the "notification area".
Package: libreoffice-gtk3
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64eb mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
@@ -702,12 +701,27 @@ Depends: libreoffice-core (= ${binary:Version}),
Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
+Replaces: libreoffice-core (<< 1:5.0.2~rc1), libreoffice-gtk (<< 1:5.1.0~)
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.
+ It also contains a (basic) GTK+ document viewer widget.
+
+Package: gir1.2-lokdocview-0.1
+Architecture: any
+Section: introspection
+Depends: libreoffice-gtk3 (= ${binary:Version}),
+ ${gir:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: GTK3 widget wrapping LibreOffice functionality - introspection
+ LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
+ exposes a simple API for applications to use this widget.
+ .
+ This package contains the Introspection data.
Package: libreoffice-gnome
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64eb mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
@@ -4264,7 +4278,7 @@ Package: libreofficekit-dev
Section: libdevel
Architecture: all
Depends: ${misc:Depends}
-Suggests: libgtk-3-dev
+Suggests: gir1.2-lokdocview-0.1, libgtk-3-dev
Recommends: libreoffice-core
Description: LibreOfficeKit -- headers
LibreOfficeKit can be used for accessing LibreOffice functionality through
@@ -4374,6 +4388,7 @@ Depends: ant (>= 1.7.0),
g++-mingw-w64-i686,
gdb,
gettext,
+ gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
diff --git a/control.in b/control.in
index 5f586bd..e09cd62 100644
--- a/control.in
+++ b/control.in
@@ -518,15 +518,13 @@ Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
-Replaces: libreoffice-core (<< 1:5.0.2~rc1)
Description: office productivity suite -- GTK+ 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
- under GNOME. It also contains a QuickStarter for the "notification area"
- and a (basic) GTK+ document viewer widget.
+ under GNOME. It also contains a QuickStarter for the "notification area".
Package: libreoffice-gtk3
Architecture: %OOO_ARCHS%
@@ -536,12 +534,14 @@ Depends: libreoffice-core (= ${binary:Version}),
Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
+Replaces: libreoffice-core (<< 1:5.0.2~rc1), libreoffice-gtk (<< 1:5.1.0~)
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.
+ It also contains a (basic) GTK+ document viewer widget.
Package: gir1.2-lokdocview-0.1
Architecture: any
diff --git a/rules b/rules
index dc4f709..dd2a7c5 100755
--- a/rules
+++ b/rules
@@ -2543,6 +2543,7 @@ ifeq "$(BUILD_GTK3)" "y"
rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
+ mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk3/$(OODIR)/program/
mkdir -p debian/gir1.2-lokdocview-0.1/usr/share/gir-1.0
mkdir -p debian/gir1.2-lokdocview-0.1/usr/lib/girepository-1.0
mv debian/tmp/usr/share/gir-1.0/LOKDocView-0.1.gir \
@@ -2555,7 +2556,6 @@ endif
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
- mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk/$(OODIR)/program/
ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: