Bluetooth Menu

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

  1. no-more-autostart
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
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) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+316485@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: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)
Revision history for this message
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2016-07-18 16:09:45 +0000
+++ configure.ac 2017-02-06 17:24:24 +0000
@@ -61,7 +61,6 @@
61AC_OUTPUT([61AC_OUTPUT([
62Makefile62Makefile
63data/Makefile63data/Makefile
64data/upstart/Makefile
65po/Makefile.in64po/Makefile.in
66src/Makefile65src/Makefile
67])66])
6867
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2016-07-18 16:09:45 +0000
+++ data/Makefile.am 2017-02-06 17:24:24 +0000
@@ -2,8 +2,6 @@
2EXTRA_DIST =2EXTRA_DIST =
3CLEANFILES =3CLEANFILES =
44
5SUBDIRS = upstart
6
7# the indicator bus file5# the indicator bus file
8indicatorsdir = $(datadir)/unity/indicators6indicatorsdir = $(datadir)/unity/indicators
9dist_indicators_DATA = com.canonical.indicator.bluetooth7dist_indicators_DATA = com.canonical.indicator.bluetooth
@@ -33,16 +31,6 @@
33EXTRA_DIST += $(upstart_jobs_in)31EXTRA_DIST += $(upstart_jobs_in)
34CLEANFILES += $(upstart_jobs_DATA)32CLEANFILES += $(upstart_jobs_DATA)
3533
36# the xdg autostart job file
37xdg_autostartdir = /etc/xdg/autostart
38xdg_autostart_DATA = indicator-bluetooth.desktop
39xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
40$(xdg_autostart_DATA): $(xdg_autostart_in)
41 $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
42BUILT_SOURCES += $(xdg_autostart_DATA)
43EXTRA_DIST += $(xdg_autostart_in)
44CLEANFILES += $(xdg_autostart_DATA)
45
46# the gsettings schema34# the gsettings schema
47gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml35gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
48@INTLTOOL_XML_NOMERGE_RULE@36@INTLTOOL_XML_NOMERGE_RULE@
@@ -50,8 +38,7 @@
5038
51EXTRA_DIST += \39EXTRA_DIST += \
52 com.canonical.indicator.bluetooth.gschema.xml.in \40 com.canonical.indicator.bluetooth.gschema.xml.in \
53 indicator-bluetooth.conf.in \41 indicator-bluetooth.conf.in
54 indicator-bluetooth.desktop.in
5542
56CLEANFILES += \43CLEANFILES += \
57 $(dbus_services_DATA) \44 $(dbus_services_DATA) \
5845
=== removed file 'data/indicator-bluetooth.desktop.in'
--- data/indicator-bluetooth.desktop.in 2014-02-26 16:33:46 +0000
+++ data/indicator-bluetooth.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Bluetooth
4Exec=@pkglibexecdir@/indicator-bluetooth-service
5NoDisplay=true
6StartupNotify=false
7Terminal=false
8OnlyShowIn=Unity;GNOME;
9AutostartCondition=GNOME3 unless-session gnome
100
=== removed directory 'data/upstart'
=== removed file 'data/upstart/Makefile.am'
--- data/upstart/Makefile.am 2014-02-20 03:23:36 +0000
+++ data/upstart/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1BUILT_SOURCES =
2EXTRA_DIST =
3CLEANFILES =
4
5# the upstart version of the xdg autostart job file
6# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
7upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
8upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
9upstart_xdg_autostart_in = indicator-bluetooth.desktop.in
10$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
11 $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
12BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
13EXTRA_DIST += $(upstart_xdg_autostart_in)
14CLEANFILES += $(upstart_xdg_autostart_DATA)
15
16EXTRA_DIST += \
17 indicator-bluetooth.upstart.desktop.in
180
=== removed file 'data/upstart/indicator-bluetooth.desktop.in'
--- data/upstart/indicator-bluetooth.desktop.in 2014-02-20 03:23:36 +0000
+++ data/upstart/indicator-bluetooth.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Bluetooth
4Exec=@pkglibexecdir@/indicator-bluetooth-service
5NoDisplay=true
6StartupNotify=false
7Terminal=false
8OnlyShowIn=Unity;
9Hidden=true
100
=== added file 'debian/indicator-bluetooth.maintscript'
--- debian/indicator-bluetooth.maintscript 1970-01-01 00:00:00 +0000
+++ debian/indicator-bluetooth.maintscript 2017-02-06 17:24:24 +0000
@@ -0,0 +1,1 @@
1rm_conffile /etc/xdg/autostart/indicator-bluetooth.desktop 0replaceme~

Subscribers

People subscribed via source and target branches