diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 21 | ||||
| -rw-r--r-- | data/ayatana-indicator-application.conf.in | 22 | ||||
| -rw-r--r-- | data/ayatana-indicator-application.override | 1 | ||||
| -rw-r--r-- | data/upstart/Makefile.am | 9 | ||||
| -rw-r--r-- | data/upstart/ayatana-indicator-application.desktop.in | 8 |
5 files changed, 5 insertions, 56 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 96abc17..671d5c0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,11 +1,4 @@ - -SUBDIRS = upstart - -upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = ayatana-indicator-application.conf - -%.conf: %.conf.in - $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +NULL = xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = ayatana-indicator-application.desktop @@ -24,17 +17,13 @@ systemddir = $(SYSTEMD_USERDIR) systemd_DATA = ayatana-indicator-application.service #endif -upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart -upstartsystemdoverride_DATA = ayatana-indicator-application.override - EXTRA_DIST = \ ayatana-indicator-application.desktop.in \ - ayatana-indicator-application.conf.in \ ayatana-indicator-application.service.in \ - ayatana-indicator-application.override \ - ordering-override.keyfile + ordering-override.keyfile \ + $(NULL) CLEANFILES = \ - ayatana-indicator-application.conf \ ayatana-indicator-application.desktop \ - ayatana-indicator-application.service + ayatana-indicator-application.service \ + $(NULL) diff --git a/data/ayatana-indicator-application.conf.in b/data/ayatana-indicator-application.conf.in deleted file mode 100644 index 8d884c5..0000000 --- a/data/ayatana-indicator-application.conf.in +++ /dev/null @@ -1,22 +0,0 @@ -description "Ayatana Indicator Application Service" - -start on ayatana-indicator-services-start -stop on desktop-end or ayatana-indicator-services-end - -emits ayatana-appindicators-start ayatana-appindicators-end - -respawn -respawn limit 2 10 - -pre-start script - # NOTE: Limiting only to Unity 7 right now as it's still using - # dbusmenu. That can be lifted after it is ported to GMenu - - if [ "x$DESKTOP_SESSION" = "xubuntu-touch" ] ; then - stop; exit 0 - fi -end script - -exec $SNAP@pkglibexecdir@/ayatana-indicator-application-service - -pre-stop exec initctl emit ayatana-appindicators-end diff --git a/data/ayatana-indicator-application.override b/data/ayatana-indicator-application.override deleted file mode 100644 index 2905494..0000000 --- a/data/ayatana-indicator-application.override +++ /dev/null @@ -1 +0,0 @@ -manual diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am deleted file mode 100644 index 6866ed0..0000000 --- a/data/upstart/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart -xdg_autostart_DATA = ayatana-indicator-application.desktop - -%.desktop: %.desktop.in - sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@ - -EXTRA_DIST = \ - ayatana-indicator-application.desktop.in diff --git a/data/upstart/ayatana-indicator-application.desktop.in b/data/upstart/ayatana-indicator-application.desktop.in deleted file mode 100644 index 171a318..0000000 --- a/data/upstart/ayatana-indicator-application.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Ayatana Indicator Application -Exec=@pkglibexecdir@/ayatana-indicator-application-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity; -Hidden=true |