diff options
author | Robert Tari <robert@tari.in> | 2020-08-11 07:39:40 +0200 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2020-08-11 07:39:40 +0200 |
commit | 6a989d2bf5a215ceef32c58e0e21a91842bff7de (patch) | |
tree | 0d0972d8145a0613aad1b76c794304788f183368 /data | |
parent | 3e9ceaf26f2c3df9f2356c66bd549343fcc46830 (diff) | |
parent | 456ef4bfbedc1c1a959753b8f2e03d931c643cb3 (diff) | |
download | ayatana-indicator-session-6a989d2bf5a215ceef32c58e0e21a91842bff7de.tar.gz ayatana-indicator-session-6a989d2bf5a215ceef32c58e0e21a91842bff7de.tar.bz2 ayatana-indicator-session-6a989d2bf5a215ceef32c58e0e21a91842bff7de.zip |
Merge branch 'sunweaver-pr/drop-upstart-support'
Attributes GH PR #9: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/9
Diffstat (limited to 'data')
-rw-r--r-- | data/CMakeLists.txt | 52 | ||||
-rw-r--r-- | data/ayatana-indicator-session.conf.in | 9 | ||||
-rw-r--r-- | data/ayatana-indicator-session.override | 1 | ||||
-rw-r--r-- | data/ayatana-indicator-session.upstart.desktop.in | 9 |
4 files changed, 0 insertions, 71 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index fd2904d..bb52600 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -37,40 +37,9 @@ if (${SYSTEMD_FOUND}) 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 Config File -## - -# where to install -set (UPSTART_JOB_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions") -message (STATUS "${UPSTART_JOB_DIR} is the Upstart Job install dir") - -set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf") -set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}") -set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in") - -# build it -set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") -configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}") - -# install it -install (FILES "${UPSTART_JOB_FILE}" - DESTINATION "${UPSTART_JOB_DIR}") - - -## ## XDG Autostart Config File ## @@ -91,27 +60,6 @@ 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}") - -## ## Ayatana Indicator File ## diff --git a/data/ayatana-indicator-session.conf.in b/data/ayatana-indicator-session.conf.in deleted file mode 100644 index d6474f4..0000000 --- a/data/ayatana-indicator-session.conf.in +++ /dev/null @@ -1,9 +0,0 @@ -description "Ayatana Indicator Session Service" - -start on ayatana-indicator-services-start -stop on desktop-end or ayatana-indicator-services-end - -respawn -respawn limit 2 10 - -exec @pkglibexecdir@/ayatana-indicator-session-service diff --git a/data/ayatana-indicator-session.override b/data/ayatana-indicator-session.override deleted file mode 100644 index 2905494..0000000 --- a/data/ayatana-indicator-session.override +++ /dev/null @@ -1 +0,0 @@ -manual diff --git a/data/ayatana-indicator-session.upstart.desktop.in b/data/ayatana-indicator-session.upstart.desktop.in deleted file mode 100644 index 466c5b8..0000000 --- a/data/ayatana-indicator-session.upstart.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Ayatana Indicator Session -Exec=@pkglibexecdir@/ayatana-indicator-session-service -OnlyShowIn=Unity; -NoDisplay=true -StartupNotify=false -Terminal=false -Hidden=true |