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

[dobey]

Remove old autostart .desktop files.

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

PASSED: Continuous integration, rev:473
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1599
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1606
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1384
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1384/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1384
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1384/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1384
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1384/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1384
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1384/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1384
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1384/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1384
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1384/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-07-19 07:58:21 +0000
+++ data/CMakeLists.txt	2017-02-03 20:20:43 +0000
@@ -69,47 +69,6 @@
          DESTINATION "${UPSTART_JOB_DIR}")
 
 ##
-##  XDG Autostart File
-##
-
-# where to install
-set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
-message (STATUS "${XDG_AUTOSTART_DIR} is the DBus Service File install dir")
-
-set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
-set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
-set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
-
-# install XDG autostart
-install (FILES "${XDG_AUTOSTART_FILE}"
-         DESTINATION "${XDG_AUTOSTART_DIR}")
-
-##
-##  Upstart XDG Autostart Override
-##
-
-# where to install
-set (UPSTART_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/upstart/xdg/autostart")
-message (STATUS "${UPSTART_XDG_AUTOSTART_DIR} is the Upstart XDG autostart override dir")
-
-set (UPSTART_XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.upstart.desktop")
-set (UPSTART_XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_XDG_AUTOSTART_NAME}")
-set (UPSTART_XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_XDG_AUTOSTART_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${UPSTART_XDG_AUTOSTART_FILE_IN}" "${UPSTART_XDG_AUTOSTART_FILE}")
-
-# install it
-install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
-         DESTINATION "${UPSTART_XDG_AUTOSTART_DIR}"
-         RENAME "${XDG_AUTOSTART_NAME}")
-
-##
 ##  Unity Indicator File
 ##
 

=== removed file 'data/indicator-datetime.desktop.in'
--- data/indicator-datetime.desktop.in	2016-05-14 02:07:10 +0000
+++ data/indicator-datetime.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Date & Time
-Exec=@pkglibexecdir@/indicator-datetime-service
-OnlyShowIn=Unity;GNOME;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
-Icon=@messaging_menu_icon@

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

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