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

[Colin Watson]

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

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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/indicator-network-prompt-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-prompt-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-prompt-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-prompt-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-prompt-ci/16/rebuild

review: Approve (continuous-integration)

Unmerged revisions

21. By Colin Watson on 2014-03-11

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

=== modified file 'debian/control'
--- debian/control	2013-08-08 10:34:11 +0000
+++ debian/control	2014-03-11 12:53:26 +0000
@@ -14,7 +14,7 @@
                pkg-config,
                python3-dbusmock,
                qtbase5-dev,
-               valgrind,
+               valgrind [amd64 armhf i386 powerpc],
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/indicator-network-prompt
 # If you aren't a member of ~unity-team but need to upload packaging changes,