[libreoffice] 01/02: move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and make libreofficekit-dev depend on gir1.2-lokdocview-0.1

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 821e25522edc3da9d6481b97f019408605d7367d
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jun 24 15:32:12 2017 +0200

    move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and make libreofficekit-dev depend on gir1.2-lokdocview-0.1
---
 changelog        | 7 ++++++-
 control          | 7 ++++---
 control.lokit.in | 7 ++++---
 rules            | 2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/changelog b/changelog
index 4c731d2..7b89b74 100644
--- a/changelog
+++ b/changelog
@@ -10,7 +10,12 @@ libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
     master and add conditional for system-xmlsec. yay. not enabled yet given
     it needs >= 1.2.24 which is not yet in Debian.
 
- -- Rene Engelhard <rene at debian.org>  Thu, 22 Jun 2017 14:05:04 +0200
+  * debian/rules, debian/control.lokit.in:
+    - move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and
+      make libreofficekit-dev depend on gir1.2-lokdocview-0.1 as per gir
+      policy
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 24 Jun 2017 14:03:19 +0200
 
 libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
 
diff --git a/control b/control
index 35705b6..d046f05 100644
--- a/control
+++ b/control
@@ -4305,10 +4305,11 @@ Description: office productivity suite -- SDK documentation
 
 Package: libreofficekit-dev
 Section: libdevel
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: gir1.2-lokdocview-0.1, libgtk-3-dev
+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
+Depends: gir1.2-lokdocview-0.1 (= ${binary:Version}), ${misc:Depends}
+Suggests: libgtk-3-dev
 Recommends: libreoffice-core, libreofficekit-data
+Replaces: gir1.2-lokdocview-0.1 (<< 1:5.4.0~rc1)
 Description: LibreOfficeKit -- headers
  LibreOfficeKit can be used for accessing LibreOffice functionality through
  C/C++, without any need to use UNO.
diff --git a/control.lokit.in b/control.lokit.in
index 5cc66ec..59dfd57 100644
--- a/control.lokit.in
+++ b/control.lokit.in
@@ -1,9 +1,10 @@
 Package: libreofficekit-dev
 Section: libdevel
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libgtk-3-dev, gir1.2-lokdocview-0.1
+Architecture: %OOO_ARCHS%
+Depends: ${misc:Depends}, gir1.2-lokdocview-0.1 (= ${binary:Version})
+Suggests: libgtk-3-dev
 Recommends: libreoffice-core, libreofficekit-data
+Replaces: gir1.2-lokdocview-0.1 (<< 1:5.4.0~rc1)
 Description: LibreOfficeKit -- headers
  LibreOfficeKit can be used for accessing LibreOffice functionality through
  C/C++, without any need to use UNO.
diff --git a/rules b/rules
index 608836e..ef16215 100755
--- a/rules
+++ b/rules
@@ -2202,7 +2202,7 @@ ifeq "$(PACKAGE_LOKIT)" "y"
 	echo "../../../include/LibreOfficeKit usr/include" > debian/libreofficekit-dev.install
 endif
 ifeq "$(ENABLE_INTROSPECTION)" "y"
-	echo "../usr/share/gir-1.0/LOKDocView-0.1.gir /usr/share/gir-1.0/" > debian/gir1.2-lokdocview-0.1.install
+	echo "../usr/share/gir-1.0/LOKDocView-0.1.gir /usr/share/gir-1.0/" >> debian/libreofficekit-dev.install
 	echo "../usr/lib/girepository-1.0/LOKDocView-0.1.typelib /usr/lib/$(DEB_HOST_MULTIARCH)/girepository-1.0" >> debian/gir1.2-lokdocview-0.1.install
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git