Bluetooth Menu

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

  1. snap-root
  2. Merge into trunk.16.10
Proposed by Michael Terry
Status: Merged
Approved by: Charles Kerr
Approved revision: 100
Merged at revision: 102
Proposed branch: lp:~mterry/indicator-bluetooth/snap-root
Merge into: lp:indicator-bluetooth
Diff against target: 9 lines (+1/-1)
1 file modified
data/indicator-bluetooth.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-bluetooth/snap-root
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+308172@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:100
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-bluetooth-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/866
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/873
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/679/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-bluetooth.conf.in'
2--- data/indicator-bluetooth.conf.in 2014-02-14 20:44:50 +0000
3+++ data/indicator-bluetooth.conf.in 2016-10-11 18:12:22 +0000
4@@ -6,4 +6,4 @@
5 respawn
6 respawn limit 2 10
7
8-exec @pkglibexecdir@/indicator-bluetooth-service
9+exec $SNAP@pkglibexecdir@/indicator-bluetooth-service

Subscribers

People subscribed via source and target branches