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

[Colin Watson]

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

With Qt 5.2 plus https://code.launchpad.net/~cjwatson/upstart-app-launch/porting/+merge/210385, indicator-network 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, it would be fine to restrict the build-dependency to architectures where it's available.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-11-07 11:52:44 +0000
+++ debian/control	2014-03-11 12:59:12 +0000
@@ -20,7 +20,7 @@
                python3-dbusmock,
                qtbase5-dev,
                valac (>= 0.22),
-               valgrind,
+               valgrind [amd64 armhf i386 powerpc],
 Standards-Version: 3.9.3
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead. ~indicator-applet-developers will notice