aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodney Dawes <dobey.pwns@gmail.com>2017-05-15 15:07:23 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-15 15:07:23 +0200
commit51a4186c117b81f4f39a1f86750e394895c77819 (patch)
treedcad45433651a1562b788a64ab7fcd96afad27ab
parentbd1a508aeb9e498dd782678da420d5baf639b4c0 (diff)
downloadayatana-indicator-power-51a4186c117b81f4f39a1f86750e394895c77819.tar.gz
ayatana-indicator-power-51a4186c117b81f4f39a1f86750e394895c77819.tar.bz2
ayatana-indicator-power-51a4186c117b81f4f39a1f86750e394895c77819.zip
Remove old autostart files.
-rw-r--r--data/CMakeLists.txt42
-rw-r--r--data/ayatana-indicator-power.desktop.in9
-rw-r--r--data/ayatana-indicator-power.upstart.desktop.in10
-rw-r--r--debian/ayatana-indicator-power.maintscript1
4 files changed, 1 insertions, 61 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8844326..78072da 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -66,48 +66,6 @@ configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
install (FILES "${UPSTART_JOB_FILE}"
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 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}")
-
-##
## Unity Indicator File
##
diff --git a/data/ayatana-indicator-power.desktop.in b/data/ayatana-indicator-power.desktop.in
deleted file mode 100644
index 14df386..0000000
--- a/data/ayatana-indicator-power.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Ayatana Indicator Power
-Exec=@pkglibexecdir@/ayatana-indicator-power-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/ayatana-indicator-power.upstart.desktop.in b/data/ayatana-indicator-power.upstart.desktop.in
deleted file mode 100644
index 8c6428d..0000000
--- a/data/ayatana-indicator-power.upstart.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Ayatana Indicator Power
-Exec=@pkglibexecdir@/ayatana-indicator-power-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
-Hidden=true
diff --git a/debian/ayatana-indicator-power.maintscript b/debian/ayatana-indicator-power.maintscript
new file mode 100644
index 0000000..3a1aa08
--- /dev/null
+++ b/debian/ayatana-indicator-power.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/indicator-power.desktop 0replaceme~