Merge branch 'sunweaver-pr/drop-upstart-support'

Attributes GH PR #10: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/10

4 files changed, 0 insertions, 71 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index f158346..c460586 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -37,40 +37,9 @@ 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 File
-##
-
-# where to install
-set (UPSTART_JOB_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
-message (STATUS "${UPSTART_JOB_DIR} is the Upstart Job File 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 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-datetime.conf.in b/data/ayatana-indicator-datetime.conf.in
deleted file mode 100644
index 8b3e1b8..0000000
--- a/data/ayatana-indicator-datetime.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Ayatana Indicator Date & Time Backend"
-
-start on ayatana-indicator-services-start
-stop on desktop-end or ayatana-indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/ayatana-indicator-datetime-service
diff --git a/data/ayatana-indicator-datetime.override b/data/ayatana-indicator-datetime.override
deleted file mode 100644
index 2905494..0000000
--- a/data/ayatana-indicator-datetime.override
+++ /dev/null
@@ -1 +0,0 @@
-manual
diff --git a/data/ayatana-indicator-datetime.upstart.desktop.in b/data/ayatana-indicator-datetime.upstart.desktop.in
deleted file mode 100644
index 7d053e0..0000000
--- a/data/ayatana-indicator-datetime.upstart.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Ayatana Indicator Date & Time
-Exec=@pkglibexecdir@/ayatana-indicator-datetime-service
-OnlyShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true