aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodney Dawes <rodney.dawes@canonical.com>2017-02-08 04:36:51 +0000
committerBileto Bot <ci-train-bot@canonical.com>2017-02-08 04:36:51 +0000
commit9acff54f4c084ac5ffa707ce900ae1f87e22dd91 (patch)
treea50b5ad56b281f321898c39949b8f0419fefc8be
parentb61052da17119b8607a4bcb9c8a7559e092873ee (diff)
parent088782b986aac9e6cc22deae1827c4754f960aef (diff)
downloadayatana-indicator-sound-9acff54f4c084ac5ffa707ce900ae1f87e22dd91.tar.gz
ayatana-indicator-sound-9acff54f4c084ac5ffa707ce900ae1f87e22dd91.tar.bz2
ayatana-indicator-sound-9acff54f4c084ac5ffa707ce900ae1f87e22dd91.zip
Remove old autostart files.
Approved by: Xavi Garcia
-rw-r--r--data/CMakeLists.txt41
-rw-r--r--data/indicator-sound.desktop.in9
-rw-r--r--data/indicator-sound.upstart.desktop.in9
-rw-r--r--debian/indicator-sound.maintscript1
4 files changed, 1 insertions, 59 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 50ed054..8e0ba0d 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -69,47 +69,6 @@ install(
)
###########################
-# XDG Autostart
-###########################
-
-set(
- INDICATOR_SOUND_XDG_AUTOSTART
- "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
-)
-
-configure_file(
- "indicator-sound.desktop.in"
- ${INDICATOR_SOUND_XDG_AUTOSTART}
- @ONLY
-)
-
-install(
- FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
- DESTINATION "/etc/xdg/autostart"
-)
-
-###########################
-# Upstart XDG Autostart Override
-###########################
-
-set(
- INDICATOR_SOUND_UPSTART_XDG_AUTOSTART
- "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.upstart.desktop"
-)
-
-configure_file(
- "indicator-sound.upstart.desktop.in"
- ${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}
- @ONLY
-)
-
-install(
- FILES "${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/xdg/autostart"
- RENAME "indicator-sound.desktop"
-)
-
-###########################
# GSettings
###########################
diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
deleted file mode 100644
index 6d31a9a..0000000
--- a/data/indicator-sound.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;GNOME;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-sound.upstart.desktop.in b/data/indicator-sound.upstart.desktop.in
deleted file mode 100644
index 0380ab8..0000000
--- a/data/indicator-sound.upstart.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true
diff --git a/debian/indicator-sound.maintscript b/debian/indicator-sound.maintscript
new file mode 100644
index 0000000..c326262
--- /dev/null
+++ b/debian/indicator-sound.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/indicator-sound.desktop 0replaceme~