[SCM] qtbase packaging branch, master, updated. 24c6b26893f837860ae72a280a1b4db2f35840d3

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=24c6b26

The following commit has been merged in the master branch:
commit 24c6b26893f837860ae72a280a1b4db2f35840d3
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Sun Jan 6 12:35:02 2013 +0200

    Turn examples multiarch
---
 debian/control                  |    1 +
 debian/qtbase5-examples.install |    2 +-
 debian/rules                    |    6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index d2b8b80..7509c83 100644
--- a/debian/control
+++ b/debian/control
@@ -371,6 +371,7 @@ Description: Qt 5 qmake Makefile generator tool
 
 Package: qtbase5-examples
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/qtbase5-examples.install b/debian/qtbase5-examples.install
index 7d75ff6..f281302 100644
--- a/debian/qtbase5-examples.install
+++ b/debian/qtbase5-examples.install
@@ -1 +1 @@
-usr/lib/qt5/examples
+usr/lib/*/qt5/examples
diff --git a/debian/rules b/debian/rules
index c69b5dc..1e3cc5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ endif
 	            -importdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/imports" \
 	            -translationdir "/usr/share/qt5/translations" \
 	            -sysconfdir "/etc/xdg" \
-	            -examplesdir "/usr/lib/qt5/examples" \
+	            -examplesdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples" \
 	            -opensource \
 	            -fast \
 	            -plugin-sql-mysql \
@@ -231,7 +231,7 @@ override_dh_auto_install:
 	ln -s /etc/xdg/qtchooser/qt5.conf $(CURDIR)/debian/tmp/etc/xdg/qtchooser/default.conf
 
 	# Remove leftover directories
-	find $(CURDIR)/debian/tmp/usr/lib/qt5 -depth -type d \( -false \
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \
 	  -o -name .moc\* \
 	  -o -name .obj\* \
 	  -o -name .pch \
@@ -242,7 +242,7 @@ override_dh_auto_install:
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 
 	# Remove bogus exec bits from some data files in mkspecs, docs, examples
-	find debian/tmp/usr/share/qt5/ debian/tmp/usr/lib/qt5/ \
+	find debian/tmp/usr/share/qt5/ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
 		-perm /u+x,g+x,o+x -type f \
 		-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
 		-exec chmod a-x {} \;

-- 
qtbase packaging