Indicator Location

Merge lp:~dobey/indicator-location/no-more-autostart into lp:indicator-location

  1. no-more-autostart
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 162
Merged at revision: 162
Proposed branch: lp:~dobey/indicator-location/no-more-autostart
Merge into: lp:indicator-location
Diff against target: 85 lines (+1/-59)
4 files modified
data/CMakeLists.txt (+0/-41)
data/indicator-location.desktop.in (+0/-9)
data/indicator-location.upstart.desktop.in (+0/-9)
debian/indicator-location.maintscript (+1/-0)
To merge this branch: bzr merge lp:~dobey/indicator-location/no-more-autostart
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+316492@code.launchpad.net

Commit message

Remove old autostart files.

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:162
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1607
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1614
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1392
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1392/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1392
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1392/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1392
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1392/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1392
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1392/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1392
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1392/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1392
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1392/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-07-19 08:47:36 +0000
3+++ data/CMakeLists.txt 2017-02-06 19:04:37 +0000
4@@ -19,47 +19,6 @@
5 DESTINATION "${UPSTART_JOBS_DIR}")
6
7 ##
8-## XDG Autostart File
9-##
10-
11-# where to install
12-set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
13-message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
14-
15-set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
16-set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
17-set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
18-
19-# build it
20-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
21-configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
22-
23-# install it
24-install (FILES "${XDG_AUTOSTART_FILE}"
25- DESTINATION "${XDG_AUTOSTART_DIR}")
26-
27-##
28-## Upstart XDG Autostart Override
29-##
30-
31-# where to install
32-set (UPSTART_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/upstart/xdg/autostart")
33-message (STATUS "${UPSTART_XDG_AUTOSTART_DIR} is the Upstart XDG autostart override dir")
34-
35-set (UPSTART_XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.upstart.desktop")
36-set (UPSTART_XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_XDG_AUTOSTART_NAME}")
37-set (UPSTART_XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_XDG_AUTOSTART_NAME}.in")
38-
39-# build it
40-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
41-configure_file ("${UPSTART_XDG_AUTOSTART_FILE_IN}" "${UPSTART_XDG_AUTOSTART_FILE}")
42-
43-# install it
44-install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
45- DESTINATION "${UPSTART_XDG_AUTOSTART_DIR}"
46- RENAME "${XDG_AUTOSTART_NAME}")
47-
48-##
49 ## Systemd Unit File
50 ##
51
52
53=== removed file 'data/indicator-location.desktop.in'
54--- data/indicator-location.desktop.in 2014-02-26 16:36:39 +0000
55+++ data/indicator-location.desktop.in 1970-01-01 00:00:00 +0000
56@@ -1,9 +0,0 @@
57-[Desktop Entry]
58-Type=Application
59-Name=Indicator Location
60-Exec=@pkglibexecdir@/indicator-location-service
61-OnlyShowIn=Unity;GNOME;
62-NoDisplay=true
63-StartupNotify=false
64-Terminal=false
65-AutostartCondition=GNOME3 unless-session gnome
66
67=== removed file 'data/indicator-location.upstart.desktop.in'
68--- data/indicator-location.upstart.desktop.in 2014-02-20 04:48:08 +0000
69+++ data/indicator-location.upstart.desktop.in 1970-01-01 00:00:00 +0000
70@@ -1,9 +0,0 @@
71-[Desktop Entry]
72-Type=Application
73-Name=Indicator Location
74-Exec=@pkglibexecdir@/indicator-location-service
75-OnlyShowIn=Unity;
76-NoDisplay=true
77-StartupNotify=false
78-Terminal=false
79-Hidden=true
80
81=== added file 'debian/indicator-location.maintscript'
82--- debian/indicator-location.maintscript 1970-01-01 00:00:00 +0000
83+++ debian/indicator-location.maintscript 2017-02-06 19:04:37 +0000
84@@ -0,0 +1,1 @@
85+rm_conffile /etc/xdg/autostart/indicator-location.desktop 0replaceme~

Subscribers

People subscribed via source and target branches