Merge lp:~mterry/indicator-sound/snap-root into lp:indicator-sound

[Michael Terry]

Work when inside a snap by prefixing hard coded paths with $SNAP.

There are also two hardcoded paths in the data/*.desktop.in files. But that's a static desktop file, so $SNAP isn't appropriate. I think it makes more sense to update the code that reads those files to do the prefixing.

But this, in conjunction with [1], gets indicator-sound to appear in a snappified-unity8 session.

[1] https://code.launchpad.net/~mterry/ubuntu-touch-session/pulse-in-snap/+merge/306662

[Charles Kerr (charlesk)]

LGTM

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:540
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/858/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/865
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/672/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/672/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/3/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'data/indicator-sound.conf.in'
--- data/indicator-sound.conf.in	2015-12-23 14:13:32 +0000
+++ data/indicator-sound.conf.in	2016-10-11 14:09:21 +0000
@@ -6,4 +6,4 @@
 respawn
 respawn limit 30 10
 
-exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
+exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service