[libreoffice] 03/05: move liblibreofficekitgtk.so into an own package
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 4e99ef431ec3b9a01adce1b6e0639bdb1ef4a127
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 18 12:11:19 2016 +0100
move liblibreofficekitgtk.so into an own package
---
changelog | 7 ++++++-
control | 14 ++++++++++++--
control.gtk3.in | 14 ++++++++++++--
libreoffice-gtk3.links => liblibreofficekitgtk.links | 0
rules | 5 +++--
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index cc9e012..868df8f 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,13 @@
-libreoffice (1:5.2.0~alpha1~git20160314-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20160321-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes SVG t(ext s)pan import (closes: #665094)
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+
-- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
libreoffice (1:5.1.2~rc1-1) unstable; urgency=medium
diff --git a/control b/control
index cbfa3a7..391676d 100644
--- a/control
+++ b/control
@@ -4272,12 +4272,11 @@ Description: office productivity suite -- GTK+ 3.0 integration
.
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: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Section: introspection
-Depends: libreoffice-gtk3 (= ${binary:Version}),
+Depends: liblibreofficekitgtk (= ${binary:Version}),
${gir:Depends},
${misc:Depends},
${shlibs:Depends}
@@ -4287,6 +4286,17 @@ Description: GTK3 widget wrapping LibreOffice functionality - introspection
.
This package contains the Introspection data.
+Package: liblibreofficekitgtk
+Section: 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
+Depends: libreofficekit-data, ${shlibs:Depends}
+Replaces: libreoffice-gtk3 (<< 1:5.2.0~)
+Breaks: libreoffice-gtk3 (<< 1:5.2.0~)
+Recommends: libreoffice-core, libreoffice-gtk3
+Description: GTK3 widget wrapping LibreOffice functionality
+ This package contains a (basic) GTK+ document viewer widget (used
+ by e.g. LOKDocView)
+
Package: libreofficekit-data
Architecture: all
Section: web
diff --git a/control.gtk3.in b/control.gtk3.in
index aa626da..6e4a5ae 100644
--- a/control.gtk3.in
+++ b/control.gtk3.in
@@ -13,18 +13,28 @@ Description: office productivity suite -- GTK+ 3.0 integration
.
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: %OOO_ARCHS%
Section: introspection
-Depends: ${shlibs:Depends}, ${gir:Depends}, ${misc:Depends}, libreoffice-gtk3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${gir:Depends}, ${misc:Depends}, liblibreofficekitgtk (= ${binary:Version})
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: liblibreofficekitgtk
+Section: gnome
+Architecture: %OOO_ARCHS%
+Depends: ${shlibs:Depends}, libreofficekit-data
+Replaces: libreoffice-gtk3 (<< 1:5.2.0~)
+Breaks: libreoffice-gtk3 (<< 1:5.2.0~)
+Recommends: libreoffice-core, libreoffice-gtk3
+Description: GTK3 widget wrapping LibreOffice functionality
+ This package contains a (basic) GTK+ document viewer widget (used
+ by e.g. LOKDocView)
+
Package: libreofficekit-data
Architecture: all
Section: web
diff --git a/libreoffice-gtk3.links b/liblibreofficekitgtk.links
similarity index 100%
rename from libreoffice-gtk3.links
rename to liblibreofficekitgtk.links
diff --git a/rules b/rules
index d178290..7236451 100755
--- a/rules
+++ b/rules
@@ -1589,7 +1589,7 @@ clean-debdir:
find debian -name "*.links" ! -name "libreoffice-dev-doc.links" \
! -name "libreoffice-java-common.links" \
- ! -name "libreoffice-gtk3.links" -exec rm {} \;
+ ! -name "liblibreofficekitgtk.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/*.bug-script
rm -f debian/scripts/aotcompile.py*
@@ -2564,8 +2564,9 @@ endif
ifeq "$(BUILD_GTK3)" "y"
rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
+ mkdir -p -m755 debian/liblibreofficekitgtk/$(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/
+ mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so debian/liblibreofficekitgtk/$(OODIR)/program/
endif
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: