diff options
| author | Rodney Dawes <rodney.dawes@canonical.com> | 2017-02-10 17:08:09 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2017-02-10 17:08:09 +0000 |
| commit | 1ff41c350bb36afa2dc42f0f3e527794f5bc6626 (patch) | |
| tree | f4f6cc47cb2040b14b116f9b75480a7df1cb192a | |
| parent | 472445887cb7f7a16e2c3fb5dca1f19a52d55bab (diff) | |
| parent | ab90c817e8af1064373967a05312092f2e90b76c (diff) | |
| download | ayatana-indicator-display-1ff41c350bb36afa2dc42f0f3e527794f5bc6626.tar.gz ayatana-indicator-display-1ff41c350bb36afa2dc42f0f3e527794f5bc6626.tar.bz2 ayatana-indicator-display-1ff41c350bb36afa2dc42f0f3e527794f5bc6626.zip | |
Remove old autostart files.
Approved by: Ted Gould, unity-api-1-bot
| -rw-r--r-- | data/CMakeLists.txt | 41 | ||||
| -rw-r--r-- | data/indicator-display.desktop.in | 9 | ||||
| -rw-r--r-- | data/indicator-display.upstart.desktop.in | 9 | ||||
| -rw-r--r-- | debian/indicator-display.maintscript | 1 |
4 files changed, 1 insertions, 59 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2e42eda..d74ca48 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -19,47 +19,6 @@ install (FILES "${UPSTART_JOB_FILE}" DESTINATION "${UPSTART_JOBS_DIR}") ## -## XDG Autostart File -## - -# where to install -set (XDG_AUTOSTART_DIR "/etc/xdg/autostart") -message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart 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}") - -## ## Systemd Unit File ## diff --git a/data/indicator-display.desktop.in b/data/indicator-display.desktop.in deleted file mode 100644 index b0017b1..0000000 --- a/data/indicator-display.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Display -Exec=@pkglibexecdir@/indicator-display-service -OnlyShowIn=Unity;GNOME; -NoDisplay=true -StartupNotify=false -Terminal=false -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/indicator-display.upstart.desktop.in b/data/indicator-display.upstart.desktop.in deleted file mode 100644 index 7e6cfe6..0000000 --- a/data/indicator-display.upstart.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Display -Exec=@pkglibexecdir@/indicator-display-service -OnlyShowIn=Unity; -NoDisplay=true -StartupNotify=false -Terminal=false -Hidden=true diff --git a/debian/indicator-display.maintscript b/debian/indicator-display.maintscript new file mode 100644 index 0000000..2f6e7f6 --- /dev/null +++ b/debian/indicator-display.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/xdg/autostart/indicator-display.desktop 0replaceme~ |