Merge lp:~pete-woods/libusermetrics/qt-5.2 into lp:libusermetrics

[Pete Woods]

Disable Valgrind on ARM

Disable Valgrind on ARM

[lp:~pete-woods/libusermetrics/qt-5.2]

149. By Pete Woods on 2014-03-03

Restore the doxygen building

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-trusty-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/libusermetrics-trusty-armhf-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libusermetrics-ci/73/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Landed in https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+packages

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2013-07-04 10:30:17 +0000
+++ debian/rules	2014-03-03 13:29:17 +0000
@@ -3,11 +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 -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=YES
+	dh_auto_configure -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V