[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit 5a99263c568478f33f010b084dadf7c30087353c
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 27 18:25:22 2011 +0200

    add DEB_HOST_MULTIARCH support for libdir/plugindir.
---
 debian/changelog |    2 ++
 debian/rules     |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f12bf47..7a8e58a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
     - qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
       plugin path.
   * Update debian/control: mark Qt libraries as Multi-Arch.
+  * Update debian/rules:
+    - add DEB_HOST_MULTIARCH support for libdir/plugindir.
 
   [ Pino Toscano ]
   * Use the hurd-g++ mkspec when building on Hurd:
diff --git a/debian/rules b/debian/rules
index 6974b98..c92d940 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
 export LDFLAGS := -Wl,--as-needed
@@ -103,11 +105,11 @@ endif
 	./configure -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/bin" \
-	            -libdir "/usr/lib" \
+	            -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	            -docdir "/usr/share/qt4/doc" \
 	            -headerdir "/usr/include/qt4" \
 	            -datadir "/usr/share/qt4" \
-	            -plugindir "/usr/lib/qt4/plugins" \
+	            -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins" \
 	            -importdir "/usr/lib/qt4/imports" \
 	            -translationdir "/usr/share/qt4/translations" \
 	            -sysconfdir "/etc/xdg" \

-- 
Qt 4 packaging