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

Proposed by dobey on 2017-02-06
Status: Merged
Approved by: dobey on 2017-02-10
Approved revision: 104
Merged at revision: 104
Proposed branch: lp:~dobey/indicator-bluetooth/no-more-autostart
Merge into: lp:indicator-bluetooth
Diff against target: 108 lines (+2/-50)
6 files modified
configure.ac (+0/-1)
data/Makefile.am (+1/-14)
data/indicator-bluetooth.desktop.in (+0/-9)
data/upstart/Makefile.am (+0/-17)
data/upstart/indicator-bluetooth.desktop.in (+0/-9)
debian/indicator-bluetooth.maintscript (+1/-0)
To merge this branch: bzr merge lp:~dobey/indicator-bluetooth/no-more-autostart
Reviewer Review Type Date Requested Status
Pete Woods (community) 2017-02-06 Approve on 2017-02-10
unity-api-1-bot continuous-integration Approve on 2017-02-06
Review via email: mp+316485@code.launchpad.net

Commit message

Remove old autostart files.

To post a comment you must log in.
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:104
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-bluetooth-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1605
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1612
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1390
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1390/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1390
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1390/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1390
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1390/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1390
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1390/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1390
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1390/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1390
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1390/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2016-07-18 16:09:45 +0000
3+++ configure.ac 2017-02-06 17:24:24 +0000
4@@ -61,7 +61,6 @@
5 AC_OUTPUT([
6 Makefile
7 data/Makefile
8-data/upstart/Makefile
9 po/Makefile.in
10 src/Makefile
11 ])
12
13=== modified file 'data/Makefile.am'
14--- data/Makefile.am 2016-07-18 16:09:45 +0000
15+++ data/Makefile.am 2017-02-06 17:24:24 +0000
16@@ -2,8 +2,6 @@
17 EXTRA_DIST =
18 CLEANFILES =
19
20-SUBDIRS = upstart
21-
22 # the indicator bus file
23 indicatorsdir = $(datadir)/unity/indicators
24 dist_indicators_DATA = com.canonical.indicator.bluetooth
25@@ -33,16 +31,6 @@
26 EXTRA_DIST += $(upstart_jobs_in)
27 CLEANFILES += $(upstart_jobs_DATA)
28
29-# the xdg autostart job file
30-xdg_autostartdir = /etc/xdg/autostart
31-xdg_autostart_DATA = indicator-bluetooth.desktop
32-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
33-$(xdg_autostart_DATA): $(xdg_autostart_in)
34- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
35-BUILT_SOURCES += $(xdg_autostart_DATA)
36-EXTRA_DIST += $(xdg_autostart_in)
37-CLEANFILES += $(xdg_autostart_DATA)
38-
39 # the gsettings schema
40 gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
41 @INTLTOOL_XML_NOMERGE_RULE@
42@@ -50,8 +38,7 @@
43
44 EXTRA_DIST += \
45 com.canonical.indicator.bluetooth.gschema.xml.in \
46- indicator-bluetooth.conf.in \
47- indicator-bluetooth.desktop.in
48+ indicator-bluetooth.conf.in
49
50 CLEANFILES += \
51 $(dbus_services_DATA) \
52
53=== removed file 'data/indicator-bluetooth.desktop.in'
54--- data/indicator-bluetooth.desktop.in 2014-02-26 16:33:46 +0000
55+++ data/indicator-bluetooth.desktop.in 1970-01-01 00:00:00 +0000
56@@ -1,9 +0,0 @@
57-[Desktop Entry]
58-Type=Application
59-Name=Indicator Bluetooth
60-Exec=@pkglibexecdir@/indicator-bluetooth-service
61-NoDisplay=true
62-StartupNotify=false
63-Terminal=false
64-OnlyShowIn=Unity;GNOME;
65-AutostartCondition=GNOME3 unless-session gnome
66
67=== removed directory 'data/upstart'
68=== removed file 'data/upstart/Makefile.am'
69--- data/upstart/Makefile.am 2014-02-20 03:23:36 +0000
70+++ data/upstart/Makefile.am 1970-01-01 00:00:00 +0000
71@@ -1,17 +0,0 @@
72-BUILT_SOURCES =
73-EXTRA_DIST =
74-CLEANFILES =
75-
76-# the upstart version of the xdg autostart job file
77-# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
78-upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
79-upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
80-upstart_xdg_autostart_in = indicator-bluetooth.desktop.in
81-$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
82- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
83-BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
84-EXTRA_DIST += $(upstart_xdg_autostart_in)
85-CLEANFILES += $(upstart_xdg_autostart_DATA)
86-
87-EXTRA_DIST += \
88- indicator-bluetooth.upstart.desktop.in
89
90=== removed file 'data/upstart/indicator-bluetooth.desktop.in'
91--- data/upstart/indicator-bluetooth.desktop.in 2014-02-20 03:23:36 +0000
92+++ data/upstart/indicator-bluetooth.desktop.in 1970-01-01 00:00:00 +0000
93@@ -1,9 +0,0 @@
94-[Desktop Entry]
95-Type=Application
96-Name=Indicator Bluetooth
97-Exec=@pkglibexecdir@/indicator-bluetooth-service
98-NoDisplay=true
99-StartupNotify=false
100-Terminal=false
101-OnlyShowIn=Unity;
102-Hidden=true
103
104=== added file 'debian/indicator-bluetooth.maintscript'
105--- debian/indicator-bluetooth.maintscript 1970-01-01 00:00:00 +0000
106+++ debian/indicator-bluetooth.maintscript 2017-02-06 17:24:24 +0000
107@@ -0,0 +1,1 @@
108+rm_conffile /etc/xdg/autostart/indicator-bluetooth.desktop 0replaceme~

Subscribers

People subscribed via source and target branches