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

Proposed by Pete Woods on 2014-03-03
Status: Merged
Merged at revision: 148
Proposed branch: lp:~pete-woods/libusermetrics/qt-5.2
Merge into: lp:libusermetrics
Diff against target: 22 lines (+7/-1)
1 file modified
debian/rules (+7/-1)
To merge this branch: bzr merge lp:~pete-woods/libusermetrics/qt-5.2
Reviewer Review Type Date Requested Status
Timo Jyrinki 2014-03-03 Approve on 2014-03-05
PS Jenkins bot (community) continuous-integration Approve on 2014-03-03
Review via email: mp+209065@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.
lp:~pete-woods/libusermetrics/qt-5.2 updated on 2014-03-03
149. By Pete Woods on 2014-03-03

Restore the doxygen building

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2013-07-04 10:30:17 +0000
3+++ debian/rules 2014-03-03 13:29:17 +0000
4@@ -3,11 +3,17 @@
5
6 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7
8+ifeq ($(DEB_HOST_ARCH),armhf)
9+ ENABLE_MEMCHECK_OPTION = OFF
10+else
11+ ENABLE_MEMCHECK_OPTION = ON
12+endif
13+
14 %:
15 dh $@ --parallel --fail-missing
16
17 override_dh_auto_configure:
18- dh_auto_configure -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=YES
19+ dh_auto_configure -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
20
21 override_dh_makeshlibs:
22 dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: