Merge lp:~pete-woods/unity-voice/qt-5.2 into lp:unity-voice

[Pete Woods]

Disable Valgrind on ARM

Disable Valgrind on ARM

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/unity-voice-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-voice-ci/7/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Tested to be working (https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+packages), scheduled to land together with Qt 5.2.

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2013-12-04 14:36:15 +0000
+++ debian/rules	2014-03-03 13:34:14 +0000
@@ -3,6 +3,17 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+ifeq ($(DEB_HOST_ARCH),armhf)
+        ENABLE_MEMCHECK_OPTION = OFF
+else
+        ENABLE_MEMCHECK_OPTION = ON
+endif
+
 %:
 	dh $@ --parallel --fail-missing
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V