[hkl] 01/01: un multiarch gir1.2-hkl-5.0

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch experimental
in repository hkl.

commit dd5a3de432d5dc6033550011d2712c68f59f60cf
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Feb 16 09:11:23 2015 +0100

    un multiarch gir1.2-hkl-5.0
---
 debian/control                | 1 -
 debian/gir1.2-hkl-5.0.install | 2 +-
 debian/rules                  | 9 +++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4b9f39c..8b1c11d 100644
--- a/debian/control
+++ b/debian/control
@@ -109,7 +109,6 @@ Description: diffractometer computation control library - documentation
 
 Package: gir1.2-hkl-5.0
 Architecture: any
-Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends},
diff --git a/debian/gir1.2-hkl-5.0.install b/debian/gir1.2-hkl-5.0.install
index 49d71c9..75f1a9b 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 e2e47ce..db4536b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 export DH_VERBOSE=1
 
+archtriplet := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 LDFLAGS += -Wl,--as-needed
 %:
 	dh $@ --with autoreconf,gir --dbg-package=libhkl-dbg
@@ -10,6 +12,13 @@ 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