Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/qmlrunner_use_dpkg_architecture into lp:ubuntu-ui-toolkit

[Timo Jyrinki]

Use dpkg-architecture instead of '*' for qmlrunner's symlinks. Something has broken the latter recently and dpkg-architecture is more trustworthy anyway.

Use dpkg-architecture instead of '*' for qmlrunner's symlinks. Something has broken the latter recently and dpkg-architecture is more trustworthy anyway.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:520
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/127
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/127/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/127/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Good!

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2013-05-08 05:25:53 +0000
+++ debian/rules	2013-05-29 05:06:27 +0000
@@ -3,6 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 
 %:
 	dh $@ --fail-missing
@@ -13,8 +14,8 @@
 	# Provide both legacy qmlscene and future qml links
 	# -> users may update to use the 'qml' name
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	ln -s /usr/lib/*/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qml
-	ln -s /usr/lib/*/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qmlscene
+	ln -s /usr/lib/$(DEB_HOST_MULTI_ARCH)/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qml
+	ln -s /usr/lib/$(DEB_HOST_MULTI_ARCH)/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qmlscene
 
 override_dh_install:
 	dh_auto_build -- docs