[SCM] dataquay/master: Fix multiarch for real.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cd24d21d6429dfa197865ca50f3bb0775a534b8a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Nov 18 02:59:50 2012 +0000

    Fix multiarch for real.
    
    - Add patch to provide the upstream buildsystem with preliminary support
      for multiarch builds.
    - Also properly set LIBDIR in debian/rules, rely on dpkg-architecture to
      detect which platform it's going to be built for.
    - Fix pkg-config's control file, the libdir variable was unconditionally
      set to /usr/lib.
    - Drop dependency on dh-exec and consequently adapt debian/*.install files,
      let dh_install do the job old-style way.

diff --git a/debian/control b/debian/control
index a4b72bc..db4dc95 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
 DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 9),
- dh-exec (>=0.3),
  libqt4-dev,
  librdf0-dev
 Standards-Version: 3.9.3
diff --git a/debian/libdataquay-dev.install b/debian/libdataquay-dev.install
old mode 100755
new mode 100644
index 0ddd5d9..5bd9dd0
--- a/debian/libdataquay-dev.install
+++ b/debian/libdataquay-dev.install
@@ -1,5 +1,3 @@
-#! /usr/bin/dh-exec
-
 usr/include
-usr/lib/lib*.so usr/lib/${DEB_HOST_MULTIARCH}/
-deploy/dataquay.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libdataquay0.install b/debian/libdataquay0.install
old mode 100755
new mode 100644
index 6e34120..3de3b10
--- a/debian/libdataquay0.install
+++ b/debian/libdataquay0.install
@@ -1,3 +1 @@
-#! /usr/bin/dh-exec
-
-usr/lib/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}/
+usr/lib/*/*.so.*
diff --git a/debian/patches/02-multiarch.patch b/debian/patches/02-multiarch.patch
new file mode 100644
index 0000000..d9895d7
--- /dev/null
+++ b/debian/patches/02-multiarch.patch
@@ -0,0 +1,39 @@
+Description: Preliminary support for multiarch builds.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ deploy/dataquay.pc.in |    2 +-
+ lib.pro               |    9 ++++++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+--- dataquay.orig/deploy/dataquay.pc.in
++++ dataquay/deploy/dataquay.pc.in
+@@ -1,6 +1,6 @@
+ prefix=%PREFIX%
++libdir=%LIBDIR%
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
+ 
+ Name: dataquay
+--- dataquay.orig/lib.pro
++++ dataquay/lib.pro
+@@ -66,12 +66,15 @@ linux* {
+ 	isEmpty(PREFIX) {
+ 		PREFIX = /usr/local
+ 	}
+-        target.path = $${PREFIX}/lib
++	isEmpty(LIBDIR) {
++		LIBDIR = /usr/lib
++	}
++        target.path = $${LIBDIR}
+         includes.path = $${PREFIX}/include
+         includes.files = dataquay
+-        pkgconfig.path = $${PREFIX}/lib/pkgconfig
++        pkgconfig.path = $${LIBDIR}/pkgconfig
+         pkgconfig.files = deploy/dataquay.pc
+-        pkgconfig.extra = sed -e "'"s.%PREFIX%.$${PREFIX}."'" -e "'"s.%EXTRALIBS%.$${EXTRALIBS}."'" deploy/dataquay.pc.in > deploy/dataquay.pc
++        pkgconfig.extra = sed -e "'"s.%PREFIX%.$${PREFIX}."'" -e "'"s.%LIBDIR%.$${LIBDIR}."'" -e "'"s.%EXTRALIBS%.$${EXTRALIBS}."'" deploy/dataquay.pc.in > deploy/dataquay.pc
+         INSTALLS += target includes pkgconfig
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 772646f..f36f779 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-build-fix.patch
+02-multiarch.patch
diff --git a/debian/rules b/debian/rules
index 3e15934..dc684a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	qmake dataquay.pro PREFIX=/usr
+	qmake dataquay.pro PREFIX=/usr LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+override_dh_auto_install:
+	dh_auto_install
+	cp deploy/*.pc debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/

-- 
dataquay packaging