[SCM] QCA2 library packaging branch, master, updated. debian/2.0.3-2-15-gc51447a

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=84b38ee

The following commit has been merged in the master branch:
commit 84b38eeccd2070da1e2bec62bc24d0d72eb7c770
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun May 20 11:18:27 2012 +0200

    Convert to multiarch.
---
 debian/changelog           |    1 +
 debian/libqca2-dev.install |    6 +++---
 debian/libqca2.install     |    2 +-
 debian/rules               |    5 ++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 344edfa..2af658f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qca2 (2.0.3-3) UNRELEASED; urgency=low
   * Fix FTBFS with gcc 4.7. (Closes: #667339)
     - Add fix_build_gcc4.7.diff, cherry-picked from upstream.
   * Bump Standards-Version to 3.9.3, no changes needed.
+  * Convert to multiarch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Oct 2011 16:03:44 +0200
 
diff --git a/debian/libqca2-dev.install b/debian/libqca2-dev.install
index 2e2aa2f..e64eaf7 100644
--- a/debian/libqca2-dev.install
+++ b/debian/libqca2-dev.install
@@ -1,5 +1,5 @@
 usr/include/QtCrypto
-usr/lib/libqca.prl
-usr/lib/libqca.so
-usr/lib/pkgconfig/qca2.pc
+usr/lib/*/libqca.prl
+usr/lib/*/libqca.so
+usr/lib/*/pkgconfig/qca2.pc
 usr/share/qt4/mkspecs/features/crypto.prf
diff --git a/debian/libqca2.install b/debian/libqca2.install
index b3d1ded..e53b394 100644
--- a/debian/libqca2.install
+++ b/debian/libqca2.install
@@ -1,2 +1,2 @@
-usr/lib/libqca.so.2*
+usr/lib/*/libqca.so.2*
 usr/bin/qcatool2
diff --git a/debian/rules b/debian/rules
index 3fe35fd..938eac3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,13 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 dh += --buildsystem=qmake
 
 override_dh_auto_configure:
-	./configure --verbose --prefix=/usr --qtdir=/usr/share/qt4 --debug --no-separate-debug-info
+	./configure --verbose --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --qtdir=/usr/share/qt4 \
+	  --debug --no-separate-debug-info
 	echo QMAKE_CFLAGS_DEBUG="$(CFLAGS) $(CPPFLAGS)" >> conf.pri
 	echo QMAKE_CXXFLAGS_DEBUG="$(CXXFLAGS) $(CPPFLAGS)" >> conf.pri
 	echo QMAKE_LDFLAGS_DEBUG="$(LDFLAGS)" >> conf.pri

-- 
QCA2 library packaging