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

[dobey]

Remove old autostart files.

[unity-api-1-bot (unity-api-1-bot)]

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

=== 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 @@
 AC_OUTPUT([
 Makefile
 data/Makefile
-data/upstart/Makefile
 po/Makefile.in
 src/Makefile
 ])

=== 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 @@
 EXTRA_DIST =
 CLEANFILES =
 
-SUBDIRS = upstart
-
 # the indicator bus file
 indicatorsdir = $(datadir)/unity/indicators
 dist_indicators_DATA = com.canonical.indicator.bluetooth
@@ -33,16 +31,6 @@
 EXTRA_DIST += $(upstart_jobs_in)
 CLEANFILES += $(upstart_jobs_DATA)
 
-# the xdg autostart job file
-xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = indicator-bluetooth.desktop
-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
-$(xdg_autostart_DATA): $(xdg_autostart_in)
-	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(xdg_autostart_DATA)
-EXTRA_DIST += $(xdg_autostart_in)
-CLEANFILES += $(xdg_autostart_DATA)
-
 # the gsettings schema
 gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -50,8 +38,7 @@
 
 EXTRA_DIST += \
   com.canonical.indicator.bluetooth.gschema.xml.in \
-  indicator-bluetooth.conf.in \
-  indicator-bluetooth.desktop.in
+  indicator-bluetooth.conf.in
 
 CLEANFILES += \
   $(dbus_services_DATA) \

=== 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 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Bluetooth
-Exec=@pkglibexecdir@/indicator-bluetooth-service
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-OnlyShowIn=Unity;GNOME;
-AutostartCondition=GNOME3 unless-session gnome

=== 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 @@
-BUILT_SOURCES =
-EXTRA_DIST =
-CLEANFILES =
-
-# the upstart version of the xdg autostart job file
-# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
-upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
-upstart_xdg_autostart_in = indicator-bluetooth.desktop.in
-$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
-	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
-EXTRA_DIST += $(upstart_xdg_autostart_in)
-CLEANFILES += $(upstart_xdg_autostart_DATA)
-
-EXTRA_DIST += \
-  indicator-bluetooth.upstart.desktop.in

=== 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 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Bluetooth
-Exec=@pkglibexecdir@/indicator-bluetooth-service
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-OnlyShowIn=Unity;
-Hidden=true

=== 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 @@
+rm_conffile /etc/xdg/autostart/indicator-bluetooth.desktop 0replaceme~