Merge lp:~xnox/indicator-network/lp1648360 into lp:indicator-network

[Dimitri John Ledkov]

Remove xdg autolaunch desktop files

Remove xdg autolaunch desktop files because they are redundant in zesty and up, and do not work correctly in the zesty systemd unity7 session.

All systems have systemd user sessions now, and if one wants this indicator in particular session they should be a .wants symlink shipped.

[dobey (dobey)]

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-07-19 10:15:52 +0000
+++ data/CMakeLists.txt	2016-12-08 16:52:48 +0000
@@ -100,45 +100,3 @@
 ###########################
 
 add_schema ("com.canonical.indicator.network.gschema.xml")
-
-###########################
-# 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 it
-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}")
-

=== removed file 'data/indicator-network.desktop.in'
--- data/indicator-network.desktop.in	2014-02-26 16:37:56 +0000
+++ data/indicator-network.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Network
-Exec=@NETWORK_SERVICE@
-StartupNotify=false
-Terminal=false
-OnlyShowIn=Unity;GNOME;
-AutostartCondition=GNOME3 unless-session gnome

=== removed file 'data/indicator-network.upstart.desktop.in'
--- data/indicator-network.upstart.desktop.in	2014-04-09 20:49:14 +0000
+++ data/indicator-network.upstart.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Network
-Exec=@NETWORK_SERVICE@
-StartupNotify=false
-Terminal=false
-Hidden=true
-OnlyShowIn=Unity;

=== modified file 'debian/indicator-network.install'
--- debian/indicator-network.install	2016-07-19 10:15:52 +0000
+++ debian/indicator-network.install	2016-12-08 16:52:48 +0000
@@ -1,9 +1,7 @@
-usr/share/upstart/xdg/autostart/indicator-network.desktop
 usr/share/upstart/sessions/*
 usr/share/upstart/systemd-session
 usr/share/glib-2.0/schemas/com.canonical.indicator.network.gschema.xml
 usr/share/unity/indicators/com.canonical.indicator.network
 usr/lib/*/indicator-network/*
 usr/lib/systemd
-etc/xdg/autostart/indicator-network.desktop
 usr/share/locale

=== added file 'debian/indicator-network.maintscript'
--- debian/indicator-network.maintscript	1970-01-01 00:00:00 +0000
+++ debian/indicator-network.maintscript	2016-12-08 16:52:48 +0000
@@ -0,0 +1,1 @@
+rm_conffile etc/xdg/autostart/indicator-network.desktop