diff -Nru indicator-network-0.5.1+14.04.20140318/data/CMakeLists.txt indicator-network-0.5.1+14.04.20140409.1/data/CMakeLists.txt --- indicator-network-0.5.1+14.04.20140318/data/CMakeLists.txt 2014-03-18 21:29:17.000000000 +0000 +++ indicator-network-0.5.1+14.04.20140409.1/data/CMakeLists.txt 2014-04-09 21:37:49.000000000 +0000 @@ -54,3 +54,45 @@ ########################### 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}") + diff -Nru indicator-network-0.5.1+14.04.20140318/data/indicator-network.conf.in indicator-network-0.5.1+14.04.20140409.1/data/indicator-network.conf.in --- indicator-network-0.5.1+14.04.20140318/data/indicator-network.conf.in 2014-03-18 21:29:17.000000000 +0000 +++ indicator-network-0.5.1+14.04.20140409.1/data/indicator-network.conf.in 2014-04-09 21:37:49.000000000 +0000 @@ -1,12 +1,19 @@ description "Indicator Network Backend" -author "Ted Gould " -start on indicators-loaded or indicator-services-start +start on indicator-services-start stop on desktop-end or indicator-services-end env G_MESSAGES_DEBUG=all export G_MESSAGES_DEBUG respawn +respawn limit 2 10 + +pre-start script + # NOTE: Only used on Unity8 today, not 7 + if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] ; then + stop; exit 0 + fi +end script exec @NETWORK_SERVICE@ diff -Nru indicator-network-0.5.1+14.04.20140318/data/indicator-network.desktop.in indicator-network-0.5.1+14.04.20140409.1/data/indicator-network.desktop.in --- indicator-network-0.5.1+14.04.20140318/data/indicator-network.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ indicator-network-0.5.1+14.04.20140409.1/data/indicator-network.desktop.in 2014-04-09 21:37:49.000000000 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Network +Exec=@NETWORK_SERVICE@ +StartupNotify=false +Terminal=false +OnlyShowIn=Unity;GNOME; +AutostartCondition=GNOME3 unless-session gnome diff -Nru indicator-network-0.5.1+14.04.20140318/data/indicator-network.upstart.desktop.in indicator-network-0.5.1+14.04.20140409.1/data/indicator-network.upstart.desktop.in --- indicator-network-0.5.1+14.04.20140318/data/indicator-network.upstart.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ indicator-network-0.5.1+14.04.20140409.1/data/indicator-network.upstart.desktop.in 2014-04-09 21:37:49.000000000 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Network +Exec=@NETWORK_SERVICE@ +StartupNotify=false +Terminal=false +Hidden=true +OnlyShowIn=Unity; diff -Nru indicator-network-0.5.1+14.04.20140318/debian/changelog indicator-network-0.5.1+14.04.20140409.1/debian/changelog --- indicator-network-0.5.1+14.04.20140318/debian/changelog 2014-04-10 09:35:13.000000000 +0000 +++ indicator-network-0.5.1+14.04.20140409.1/debian/changelog 2014-04-10 09:35:13.000000000 +0000 @@ -1,3 +1,13 @@ +indicator-network (0.5.1+14.04.20140409.1-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Synchronize process management across indicators (LP: #1233226) + + [ Ubuntu daily release ] + * New rebuild forced + + -- Ubuntu daily release Wed, 09 Apr 2014 21:38:03 +0000 + indicator-network (0.5.1+14.04.20140318-0ubuntu1) trusty; urgency=low [ Colin Watson ]