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

[dobey]

Remove the xdg autostart files.

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

FAILED: Continuous integration, rev:1217
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-keyboard-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1600/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1607
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1385/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1385/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1385/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1385/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1385/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1385/console

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

review: Needs Fixing (continuous-integration)

[lp:~dobey/indicator-keyboard/no-more-autostart]

1218. By dobey on 2017-02-03

Remove from configure.ac too.

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

PASSED: Continuous integration, rev:1218
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-keyboard-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1601
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1608
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1386
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1386/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1386
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1386/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1386
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1386/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1386
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1386/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1386
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1386/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1386
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1386/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2016-10-21 10:16:26 +0000
+++ configure.ac	2017-02-03 22:28:14 +0000
@@ -62,7 +62,6 @@
 
 AC_CONFIG_FILES([Makefile
                  data/Makefile
-                 data/upstart/Makefile
                  lib/Makefile
                  po/Makefile.in
                  tests/Makefile

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2016-07-19 08:16:29 +0000
+++ data/Makefile.am	2017-02-03 22:28:14 +0000
@@ -1,6 +1,4 @@
 
-SUBDIRS = upstart
-
 ###########################
 # Icon Generator
 ###########################
@@ -50,16 +48,6 @@
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 ###########################
-# XDG Autostart File
-###########################
-
-xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = indicator-keyboard.desktop
-
-%.desktop: %.desktop.in
-	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-###########################
 # Systemd configuration
 ###########################
 

=== removed file 'data/indicator-keyboard.desktop.in'
--- data/indicator-keyboard.desktop.in	2014-02-26 16:35:15 +0000
+++ data/indicator-keyboard.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Keyboard
-Exec=@pkglibexecdir@/indicator-keyboard-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome

=== removed directory 'data/upstart'
=== removed file 'data/upstart/Makefile.am'
--- data/upstart/Makefile.am	2014-02-20 04:39:39 +0000
+++ data/upstart/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-###########################
-# Upstart XDG Override
-###########################
-
-xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-xdg_autostart_DATA = indicator-keyboard.desktop
-
-%.desktop: %.desktop.in
-	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-EXTRA_DIST = indicator-keyboard.desktop.in
-

=== removed file 'data/upstart/indicator-keyboard.desktop.in'
--- data/upstart/indicator-keyboard.desktop.in	2014-02-20 04:40:34 +0000
+++ data/upstart/indicator-keyboard.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Keyboard
-Exec=@pkglibexecdir@/indicator-keyboard-service
-OnlyShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true

=== added file 'debian/indicator-keyboard.maintscript'
--- debian/indicator-keyboard.maintscript	1970-01-01 00:00:00 +0000
+++ debian/indicator-keyboard.maintscript	2017-02-03 22:28:14 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/xdg/autostart/indicator-keyboard.desktop 0replaceme~