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

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 56
Merged at revision: 56
Proposed branch: lp:~dobey/indicator-transfer/no-more-autostart
Merge into: lp:indicator-transfer
Diff against target: 99 lines (+2/-62)
5 files modified
data/CMakeLists.txt (+0/-42)
data/indicator-transfer.desktop.in (+0/-9)
data/indicator-transfer.upstart.desktop.in (+0/-9)
debian/indicator-transfer.install (+0/-2)
debian/indicator-transfer.maintscript (+2/-0)
To merge this branch: bzr merge lp:~dobey/indicator-transfer/no-more-autostart
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+316467@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:56
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1603
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1610
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1388
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1388/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1388
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1388/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1388
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1388/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1388
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1388/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1388
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1388/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1388
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1388/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/15/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 16:32:17 +0000
3+++ data/CMakeLists.txt 2017-02-06 15:03:18 +0000
4@@ -51,48 +51,6 @@
5 DESTINATION "${UPSTART_JOB_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 DBus Service File 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-##
50 ## Unity Indicator File
51 ##
52
53
54=== removed file 'data/indicator-transfer.desktop.in'
55--- data/indicator-transfer.desktop.in 2014-03-29 17:17:09 +0000
56+++ data/indicator-transfer.desktop.in 1970-01-01 00:00:00 +0000
57@@ -1,9 +0,0 @@
58-[Desktop Entry]
59-Type=Application
60-Name=Indicator Transfer
61-Exec=@pkglibexecdir@/indicator-transfer-service
62-OnlyShowIn=Unity;GNOME;
63-NoDisplay=true
64-StartupNotify=false
65-Terminal=false
66-AutostartCondition=GNOME3 unless-session gnome
67
68=== removed file 'data/indicator-transfer.upstart.desktop.in'
69--- data/indicator-transfer.upstart.desktop.in 2014-03-29 17:17:09 +0000
70+++ data/indicator-transfer.upstart.desktop.in 1970-01-01 00:00:00 +0000
71@@ -1,9 +0,0 @@
72-[Desktop Entry]
73-Type=Application
74-Name=Indicator Transfer
75-Exec=@pkglibexecdir@/indicator-transfer-service
76-OnlyShowIn=Unity;
77-NoDisplay=true
78-StartupNotify=false
79-Terminal=false
80-Hidden=true
81
82=== modified file 'debian/indicator-transfer.install'
83--- debian/indicator-transfer.install 2016-07-19 16:32:17 +0000
84+++ debian/indicator-transfer.install 2017-02-06 15:03:18 +0000
85@@ -1,7 +1,5 @@
86 usr/share/upstart/sessions/indicator-transfer.conf
87 usr/share/upstart/systemd-session
88 usr/lib/systemd
89-etc/xdg/autostart/indicator-transfer.desktop
90-usr/share/upstart/xdg/autostart/indicator-transfer.desktop
91 usr/share/unity/indicators/com.canonical.indicator.transfer
92 usr/lib/*/indicator-transfer/indicator-transfer-service
93
94=== added file 'debian/indicator-transfer.maintscript'
95--- debian/indicator-transfer.maintscript 1970-01-01 00:00:00 +0000
96+++ debian/indicator-transfer.maintscript 2017-02-06 15:03:18 +0000
97@@ -0,0 +1,2 @@
98+rm_conffile /etc/xdg/autostart/indicator-transfer.desktop 0replaceme~
99+

Subscribers

People subscribed via source and target branches