Mir

Merge lp:~cjwatson/mir/arm64-no-valgrind into lp:~mir-team/mir/trunk

Proposed by Colin Watson on 2013-10-09
Status: Merged
Approved by: Alan Griffiths on 2013-10-09
Approved revision: 1092
Merged at revision: 1094
Proposed branch: lp:~cjwatson/mir/arm64-no-valgrind
Merge into: lp:~mir-team/mir/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/mir/arm64-no-valgrind
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-09
Daniel van Vugt 2013-10-09 Approve on 2013-10-09
Review via email: mp+190051@code.launchpad.net

Commit message

Don't build-depend on valgrind on arm64 for now, as it is not yet ported there.

Description of the change

Don't build-depend on valgrind on arm64 for now, as it is not yet ported there.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-10-08 23:17:35 +0000
3+++ debian/control 2013-10-09 08:58:43 +0000
4@@ -34,7 +34,7 @@
5 umockdev,
6 libudev-dev,
7 google-mock (>= 1.6.0+svn437),
8- valgrind,
9+ valgrind [!arm64],
10 Standards-Version: 3.9.4
11 Homepage: https://launchpad.net/mir
12 # If you aren't a member of ~mir-team but need to upload packaging changes,

Subscribers

People subscribed via source and target branches