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

Proposed by Pete Woods on 2014-03-03
Status: Merged
Merged at revision: 32
Proposed branch: lp:~pete-woods/libqtdbusmock/qt-5.2
Merge into: lp:libqtdbusmock
Prerequisite: lp:~pete-woods/libqtdbusmock/typo-in-package-description
Diff against target: 22 lines (+7/-1)
1 file modified
debian/rules (+7/-1)
To merge this branch: bzr merge lp:~pete-woods/libqtdbusmock/qt-5.2
Reviewer Review Type Date Requested Status
Timo Jyrinki 2014-03-03 Approve on 2014-03-04
PS Jenkins bot (community) continuous-integration Approve on 2014-03-03
Review via email: mp+209060@code.launchpad.net

Commit message

Disable Valgrind on ARM

Description of the change

Disable Valgrind on ARM

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2014-01-08 18:32:53 +0000
+++ debian/rules 2014-03-03 12:49:11 +0000
@@ -3,11 +3,17 @@
33
4export DPKG_GENSYMBOLS_CHECK_LEVEL=44export DPKG_GENSYMBOLS_CHECK_LEVEL=4
55
6ifeq ($(DEB_HOST_ARCH),armhf)
7 ENABLE_MEMCHECK_OPTION = OFF
8else
9 ENABLE_MEMCHECK_OPTION = ON
10endif
11
6%:12%:
7 dh $@ --parallel --fail-missing13 dh $@ --parallel --fail-missing
814
9override_dh_auto_configure:15override_dh_auto_configure:
10 dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=YES16 dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
1117
12override_dh_makeshlibs:18override_dh_makeshlibs:
13 dh_makeshlibs -V19 dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: