From dc9e35c5a121d198a0969c2dc64b97ba974de19a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Aug 2020 12:40:50 +0200 Subject: Drop all references to upstart. --- data/CMakeLists.txt | 51 ------------------------- data/ayatana-indicator-sound.conf.in | 9 ----- data/ayatana-indicator-sound.override | 1 - data/ayatana-indicator-sound.upstart.desktop.in | 9 ----- 4 files changed, 70 deletions(-) delete mode 100644 data/ayatana-indicator-sound.conf.in delete mode 100644 data/ayatana-indicator-sound.override delete mode 100644 data/ayatana-indicator-sound.upstart.desktop.in (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 47d5676..ddfa2ad 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -38,38 +38,8 @@ if (${SYSTEMD_FOUND}) # install it install (FILES "${SYSTEMD_USER_FILE}" DESTINATION "${SYSTEMD_USER_DIR}") - - ########################### - # Upstart systemd override Job File - ########################### - - set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart") - message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir") - - install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override" - DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}") endif() -########################### -# Upstart Job -########################### - -set( - INDICATOR_SOUND_CONF - "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-sound.conf" -) - -configure_file( - "ayatana-indicator-sound.conf.in" - ${INDICATOR_SOUND_CONF} - @ONLY -) - -install( - FILES "${INDICATOR_SOUND_CONF}" - DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions/" -) - ########################### # XDG Autostart ########################### @@ -90,27 +60,6 @@ install( DESTINATION "/etc/xdg/autostart" ) -########################### -# Upstart XDG Autostart Override -########################### - -set( - INDICATOR_SOUND_UPSTART_XDG_AUTOSTART - "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-sound.upstart.desktop" -) - -configure_file( - "ayatana-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 "ayatana-indicator-sound.desktop" -) - ########################### # GSettings ########################### diff --git a/data/ayatana-indicator-sound.conf.in b/data/ayatana-indicator-sound.conf.in deleted file mode 100644 index 827b252..0000000 --- a/data/ayatana-indicator-sound.conf.in +++ /dev/null @@ -1,9 +0,0 @@ -description "Ayatana Indicator Sound Service" - -start on ayatana-indicator-services-start -stop on desktop-end or ayatana-indicator-services-end - -respawn -respawn limit 30 10 - -exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service diff --git a/data/ayatana-indicator-sound.override b/data/ayatana-indicator-sound.override deleted file mode 100644 index 2905494..0000000 --- a/data/ayatana-indicator-sound.override +++ /dev/null @@ -1 +0,0 @@ -manual diff --git a/data/ayatana-indicator-sound.upstart.desktop.in b/data/ayatana-indicator-sound.upstart.desktop.in deleted file mode 100644 index 87f05c3..0000000 --- a/data/ayatana-indicator-sound.upstart.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Ayatana Indicator Sound -Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service -OnlyShowIn=MATE; -NoDisplay=true -StartupNotify=false -Terminal=false -Hidden=true -- cgit v1.2.3