[SCM] prison packaging branch, master, updated. 03b605ad3aa517344c3855498063ef048f656b11

[Felix Geyer]

The following commit has been merged in the master branch:
commit 8cef593958a676b1be36d55cea548c8ac1c044e8
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Nov 9 21:04:57 2011 +0100

    Convert package for multiarch.
---
 debian/control               |    4 +++-
 debian/libprison-dev.install |    4 ++--
 debian/libprison0.install    |    2 +-
 debian/rules                 |    5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 224a586..cb85bda 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Philip Muškovac <yofel at kubuntu.org>
 Build-Depends: cmake,
-               debhelper (>= 8.0.0),
+               debhelper (>= 8.1.3~),
                libdmtx-dev,
                libqrencode-dev,
                libqt4-dev,
@@ -27,6 +27,8 @@ Description: barcode API for Qt - development files
 
 Package: libprison0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: barcode API for Qt
  prison is a barcode API currently offering a nice Qt API to produce QRCode
diff --git a/debian/libprison-dev.install b/debian/libprison-dev.install
index 82c8b79..fa8159f 100644
--- a/debian/libprison-dev.install
+++ b/debian/libprison-dev.install
@@ -9,5 +9,5 @@ usr/include/prison/barcodewidget.h
 usr/include/prison/datamatrixbarcode.h
 usr/include/prison/prison_export.h
 usr/include/prison/qrcodebarcode.h
-usr/lib/cmake/Prison/PrisonConfig.cmake
-usr/lib/libprison.so
+usr/lib/*/cmake/Prison/PrisonConfig.cmake
+usr/lib/*/libprison.so
diff --git a/debian/libprison0.install b/debian/libprison0.install
index 442f560..4589145 100644
--- a/debian/libprison0.install
+++ b/debian/libprison0.install
@@ -1 +1 @@
-usr/lib/libprison.so.0*
+usr/lib/*/libprison.so.0*
diff --git a/debian/rules b/debian/rules
index 8103b24..6893819 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,10 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+override_dh_auto_configure:
+	$(overridden_command) -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=libprison-dbg

-- 
prison packaging