diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 10 | ||||
| -rw-r--r-- | data/ayatana-indicator-printers.conf.in | 12 | ||||
| -rw-r--r-- | data/ayatana-indicator-printers.override (renamed from data/indicator-printers.override) | 0 | ||||
| -rw-r--r-- | data/ayatana-indicator-printers.service.in | 8 | ||||
| -rw-r--r-- | data/indicator-printers.conf.in | 12 | ||||
| -rw-r--r-- | data/indicator-printers.service.in | 8 |
6 files changed, 26 insertions, 24 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index e5ae964..450e31c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,3 @@ - BUILT_SOURCES= CLEANFILES= EXTRA_DIST= @@ -8,7 +7,7 @@ EXTRA_DIST= # systemddir = $(SYSTEMD_USERDIR) -systemd_DATA = indicator-printers.service +systemd_DATA = ayatana-indicator-printers.service systemd_in = $(systemd_DATA:.service=.service.in) $(systemd_DATA): $(systemd_in) $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -21,7 +20,7 @@ CLEANFILES += $(systemd_DATA) # upstart_overridedir = $(datadir)/upstart/systemd-session/upstart -upstart_override_DATA = indicator-printers.override +upstart_override_DATA = ayatana-indicator-printers.override EXTRA_DIST += $(upstart_override_DATA) # @@ -29,10 +28,13 @@ EXTRA_DIST += $(upstart_override_DATA) # upstart_jobsdir = $(datadir)/upstart/sessions -upstart_jobs_DATA = indicator-printers.conf +upstart_jobs_DATA = ayatana-indicator-printers.conf upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in) $(upstart_jobs_DATA): $(upstart_jobs_in) $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ BUILT_SOURCES += $(upstart_jobs_DATA) CLEANFILES += $(upstart_jobs_DATA) EXTRA_DIST += $(upstart_jobs_in) + +DISTCLEANFILES = \ + Makefile.in
\ No newline at end of file diff --git a/data/ayatana-indicator-printers.conf.in b/data/ayatana-indicator-printers.conf.in new file mode 100644 index 0000000..7f1f79a --- /dev/null +++ b/data/ayatana-indicator-printers.conf.in @@ -0,0 +1,12 @@ +description "Ayatana Indicator Printers Service" + +# NOTE: Limiting only to Unity 7 right now as it's still using +# dbusmenu. That can be lifted after it is ported to GMenu + +start on ayatana-indicator-services-start and xsession SESSION=ubuntu +stop on desktop-end or ayatana-indicator-services-end + +respawn +respawn limit 2 10 + +exec $SNAP@pkglibexecdir@/ayatana-indicator-printers-service diff --git a/data/indicator-printers.override b/data/ayatana-indicator-printers.override index 2905494..2905494 100644 --- a/data/indicator-printers.override +++ b/data/ayatana-indicator-printers.override diff --git a/data/ayatana-indicator-printers.service.in b/data/ayatana-indicator-printers.service.in new file mode 100644 index 0000000..e3d4fec --- /dev/null +++ b/data/ayatana-indicator-printers.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Ayatana Indicator Printers Service +PartOf=graphical-session.target +After=ayatana-indicators-pre.target + +[Service] +ExecStart=@pkglibexecdir@/ayatana-indicator-printers-service +Restart=on-failure diff --git a/data/indicator-printers.conf.in b/data/indicator-printers.conf.in deleted file mode 100644 index f17953a..0000000 --- a/data/indicator-printers.conf.in +++ /dev/null @@ -1,12 +0,0 @@ -description "Indicator Printers Service" - -# NOTE: Limiting only to Unity 7 right now as it's still using -# dbusmenu. That can be lifted after it is ported to GMenu - -start on indicator-services-start and xsession SESSION=ubuntu -stop on desktop-end or indicator-services-end - -respawn -respawn limit 2 10 - -exec $SNAP@pkglibexecdir@/indicator-printers-service diff --git a/data/indicator-printers.service.in b/data/indicator-printers.service.in deleted file mode 100644 index 4cbba6c..0000000 --- a/data/indicator-printers.service.in +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Indicator Printers Service -PartOf=graphical-session.target -After=indicators-pre.target - -[Service] -ExecStart=@pkglibexecdir@/indicator-printers-service -Restart=on-failure |