Merge lp:~cjwatson/indicator-network-prompt/porting into lp:indicator-network-prompt

Proposed by Colin Watson on 2014-03-11
Status: Needs review
Proposed branch: lp:~cjwatson/indicator-network-prompt/porting
Merge into: lp:indicator-network-prompt
Diff against target: 12 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/indicator-network-prompt/porting
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-03-11
Indicator Applet Developers 2014-03-11 Pending
Review via email: mp+210389@code.launchpad.net

Commit message

Only build-depend on valgrind on architectures that have it.

Description of the change

With Qt 5.2, indicator-network-prompt could build on all architectures, except that it build-depends on valgrind which isn't available everywhere. Since it doesn't actually use valgrind in the default build anyway (-DENABLE_MEMCHECK_OPTION=NO), it would be fine to restrict the build-dependency to architectures where it's available.

Unmerged revisions

21. By Colin Watson on 2014-03-11

Only build-depend on valgrind on architectures that have it.

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-08-08 10:34:11 +0000
3+++ debian/control 2014-03-11 12:53:26 +0000
4@@ -14,7 +14,7 @@
5 pkg-config,
6 python3-dbusmock,
7 qtbase5-dev,
8- valgrind,
9+ valgrind [amd64 armhf i386 powerpc],
10 Standards-Version: 3.9.4
11 Homepage: https://launchpad.net/indicator-network-prompt
12 # If you aren't a member of ~unity-team but need to upload packaging changes,

Subscribers

People subscribed via source and target branches