Indicator Display

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

  1. no-more-autostart
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 25
Merged at revision: 25
Proposed branch: lp:~dobey/indicator-display/no-more-autostart
Merge into: lp:indicator-display
Diff against target: 85 lines (+1/-59)
4 files modified
data/CMakeLists.txt (+0/-41)
data/indicator-display.desktop.in (+0/-9)
data/indicator-display.upstart.desktop.in (+0/-9)
debian/indicator-display.maintscript (+1/-0)
To merge this branch: bzr merge lp:~dobey/indicator-display/no-more-autostart
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+316487@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:25
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/23/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1606
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1613
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1391
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1391/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1391
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1391/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1391
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1391/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1391
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1391/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1391
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1391/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1391
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1391/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/23/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
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2016-07-19 07:57:04 +0000
+++ data/CMakeLists.txt 2017-02-06 17:43:38 +0000
@@ -19,47 +19,6 @@
19 DESTINATION "${UPSTART_JOBS_DIR}")19 DESTINATION "${UPSTART_JOBS_DIR}")
2020
21##21##
22## XDG Autostart File
23##
24
25# where to install
26set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
27message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
28
29set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
30set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
31set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
32
33# build it
34set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
35configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
36
37# install it
38install (FILES "${XDG_AUTOSTART_FILE}"
39 DESTINATION "${XDG_AUTOSTART_DIR}")
40
41##
42## Upstart XDG Autostart Override
43##
44
45# where to install
46set (UPSTART_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/upstart/xdg/autostart")
47message (STATUS "${UPSTART_XDG_AUTOSTART_DIR} is the Upstart XDG autostart override dir")
48
49set (UPSTART_XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.upstart.desktop")
50set (UPSTART_XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_XDG_AUTOSTART_NAME}")
51set (UPSTART_XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_XDG_AUTOSTART_NAME}.in")
52
53# build it
54set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
55configure_file ("${UPSTART_XDG_AUTOSTART_FILE_IN}" "${UPSTART_XDG_AUTOSTART_FILE}")
56
57# install it
58install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
59 DESTINATION "${UPSTART_XDG_AUTOSTART_DIR}"
60 RENAME "${XDG_AUTOSTART_NAME}")
61
62##
63## Systemd Unit File22## Systemd Unit File
64##23##
6524
6625
=== removed file 'data/indicator-display.desktop.in'
--- data/indicator-display.desktop.in 2014-08-20 01:34:23 +0000
+++ data/indicator-display.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Display
4Exec=@pkglibexecdir@/indicator-display-service
5OnlyShowIn=Unity;GNOME;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9AutostartCondition=GNOME3 unless-session gnome
100
=== removed file 'data/indicator-display.upstart.desktop.in'
--- data/indicator-display.upstart.desktop.in 2014-08-20 01:34:23 +0000
+++ data/indicator-display.upstart.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Display
4Exec=@pkglibexecdir@/indicator-display-service
5OnlyShowIn=Unity;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9Hidden=true
100
=== added file 'debian/indicator-display.maintscript'
--- debian/indicator-display.maintscript 1970-01-01 00:00:00 +0000
+++ debian/indicator-display.maintscript 2017-02-06 17:43:38 +0000
@@ -0,0 +1,1 @@
1rm_conffile /etc/xdg/autostart/indicator-display.desktop 0replaceme~

Subscribers

People subscribed via source and target branches