indicator-power

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

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

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/6/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 10:25:12 +0000
+++ data/CMakeLists.txt 2017-02-06 19:17:33 +0000
@@ -67,47 +67,6 @@
67 DESTINATION "${UPSTART_JOB_DIR}")67 DESTINATION "${UPSTART_JOB_DIR}")
6868
69##69##
70## XDG Autostart File
71##
72
73# where to install
74set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
75message (STATUS "${XDG_AUTOSTART_DIR} is the DBus Service File install dir")
76
77set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
78set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
79set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
80
81# build it
82set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
83configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
84
85# install it
86install (FILES "${XDG_AUTOSTART_FILE}"
87 DESTINATION "${XDG_AUTOSTART_DIR}")
88
89##
90## Upstart XDG Autostart Override
91##
92
93# where to install
94set (UPSTART_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/upstart/xdg/autostart")
95message (STATUS "${UPSTART_XDG_AUTOSTART_DIR} is the Upstart XDG autostart override dir")
96
97set (UPSTART_XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.upstart.desktop")
98set (UPSTART_XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_XDG_AUTOSTART_NAME}")
99set (UPSTART_XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_XDG_AUTOSTART_NAME}.in")
100
101# build it
102set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
103configure_file ("${UPSTART_XDG_AUTOSTART_FILE_IN}" "${UPSTART_XDG_AUTOSTART_FILE}")
104
105# install it
106install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
107 DESTINATION "${UPSTART_XDG_AUTOSTART_DIR}"
108 RENAME "${XDG_AUTOSTART_NAME}")
109
110##
111## Unity Indicator File70## Unity Indicator File
112##71##
11372
11473
=== removed file 'data/indicator-power.desktop.in'
--- data/indicator-power.desktop.in 2014-02-26 16:39:18 +0000
+++ data/indicator-power.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Power
4Exec=@pkglibexecdir@/indicator-power-service
5OnlyShowIn=Unity;GNOME;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9AutostartCondition=GNOME3 unless-session gnome
100
=== removed file 'data/indicator-power.upstart.desktop.in'
--- data/indicator-power.upstart.desktop.in 2014-09-09 03:58:48 +0000
+++ data/indicator-power.upstart.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Power
4Exec=@pkglibexecdir@/indicator-power-service
5OnlyShowIn=Unity;GNOME;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9AutostartCondition=GNOME3 unless-session gnome
10Hidden=true
110
=== added file 'debian/indicator-power.maintscript'
--- debian/indicator-power.maintscript 1970-01-01 00:00:00 +0000
+++ debian/indicator-power.maintscript 2017-02-06 19:17:33 +0000
@@ -0,0 +1,1 @@
1rm_conffile /etc/xdg/autostart/indicator-power.desktop 0replaceme~

Subscribers

People subscribed via source and target branches