[hkl] 07/11: multi-arch the gir package

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository hkl.

commit 782dbc33043e04d3a038383a2e9ec5e51fbd266e
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Jul 7 13:30:40 2015 +0200

    multi-arch the gir package
---
 debian/changelog              | 8 ++++++++
 debian/control                | 2 ++
 debian/gir1.2-hkl-5.0.install | 2 +-
 debian/rules                  | 9 ---------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d674a52..c466a60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hkl (4.99.99.1950-1) unstable; urgency=medium
+
+  * Imported Upstream version 4.99.99.1950
+  * Fix an FTBFS on sparc
+  * multi-arch also the gir package
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 07 Jul 2015 13:29:18 +0200
+
 hkl (4.99.99.1949-1~exp1) experimental; urgency=medium
 
   * Imported Upstream version 4.99.99.1949
diff --git a/debian/control b/debian/control
index 8b1c11d..5211aaf 100644
--- a/debian/control
+++ b/debian/control
@@ -109,10 +109,12 @@ Description: diffractometer computation control library - documentation
 
 Package: gir1.2-hkl-5.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends},
          ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: diffractometer computation control library - gir binding
  The hkl library is a framework for diffraction computation and
  diffractometer control, heavily used at the SOLEIL synchrotron. It
diff --git a/debian/gir1.2-hkl-5.0.install b/debian/gir1.2-hkl-5.0.install
index 75f1a9b..49d71c9 100644
--- a/debian/gir1.2-hkl-5.0.install
+++ b/debian/gir1.2-hkl-5.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
diff --git a/debian/rules b/debian/rules
index ef583b6..e307f0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 export DH_VERBOSE=1
 export MPLCONFIGDIR=$(CURDIR)
 
-archtriplet := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 LDFLAGS += -Wl,--as-needed
 %:
 	dh $@ --with autoreconf,gir --dbg-package=libhkl-dbg
@@ -13,13 +11,6 @@ LDFLAGS += -Wl,--as-needed
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-gtk-doc --enable-hkl3d --disable-static --htmldir=/usr/share/doc/libhkl-doc
 
-override_dh_auto_install:
-	dh_auto_install
-	# wheezy gobject-introspection does not support multiarch path
-	# so un-multiarch the gir repository
-	mv $(CURDIR)/debian/tmp/usr/lib/$(archtriplet)/girepository-1.0 \
-	   $(CURDIR)/debian/tmp/usr/lib
-
 override_dh_install:
 	dh_install --fail-missing -Xlibhkl.la
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git