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

[Michael Terry]

Work 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'm not sure what the best solution for those is, but presumably it would lie in whichever component consumes the desktop file, not this package.

And I left the "/usr/share/apport/recoverable_problem" hardcoded path in src/recoverable-problem.c. That seems like more of a deb-based reporting tool anyway. And I wasn't sure there is some plan for snappy to include an error reporting tool or what.

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

PASSED: Continuous integration, rev:472
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-session-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/860
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/867
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/674/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/674
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/674/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'data/indicator-session.conf.in'
--- data/indicator-session.conf.in	2014-02-20 16:17:12 +0000
+++ data/indicator-session.conf.in	2016-10-11 14:31:22 +0000
@@ -6,4 +6,4 @@
 respawn
 respawn limit 2 10
 
-exec @pkglibexecdir@/indicator-session-service
+exec $SNAP@pkglibexecdir@/indicator-session-service