aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2020-08-11 09:59:50 +0200
committerRobert Tari <robert@tari.in>2020-08-11 09:59:50 +0200
commit48eebdb7acd9aaa0831f9a9e0ae54e99979a496a (patch)
treee78da0fac4514cc7858090e95c2a3ab2efe3f739
parentb1e8aa8b40075f8f90644295af77570de9a5637a (diff)
parentd7526acd0e8932e77e27db86ce882d614003f552 (diff)
downloadayatana-indicator-printers-48eebdb7acd9aaa0831f9a9e0ae54e99979a496a.tar.gz
ayatana-indicator-printers-48eebdb7acd9aaa0831f9a9e0ae54e99979a496a.tar.bz2
ayatana-indicator-printers-48eebdb7acd9aaa0831f9a9e0ae54e99979a496a.zip
Merge branch 'pr/drop-upstart-support' of https://github.com/sunweaver/ayatana-indicator-printers into sunweaver-pr/drop-upstart-support
Attributes GH PR #5: https://github.com/AyatanaIndicators/ayatana-indicator-printers/pull/5
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am24
-rw-r--r--data/ayatana-indicator-printers.conf.in12
-rw-r--r--data/ayatana-indicator-printers.override1
-rw-r--r--data/upstart/Makefile.am16
-rw-r--r--data/upstart/ayatana-indicator-printers.desktop.in9
6 files changed, 0 insertions, 63 deletions
diff --git a/configure.ac b/configure.ac
index 36567b5..a8b4e98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ AC_CONFIG_FILES([
Makefile
src/Makefile
data/Makefile
- data/upstart/Makefile
test/Makefile
po/Makefile.in
])
diff --git a/data/Makefile.am b/data/Makefile.am
index 68d6ca7..8bf680d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,8 +2,6 @@ BUILT_SOURCES=
CLEANFILES=
EXTRA_DIST=
-SUBDIRS = upstart
-
#
# the systemd unit file
#
@@ -17,30 +15,9 @@ $(systemd_DATA): $(systemd_in)
BUILT_SOURCES += $(systemd_DATA)
EXTRA_DIST += $(systemd_in)
CLEANFILES += $(systemd_DATA)
-
-#
-# the systemd upstart override
-#
-
-upstart_overridedir = $(datadir)/upstart/systemd-session/upstart
-upstart_override_DATA = ayatana-indicator-printers.override
-EXTRA_DIST += $(upstart_override_DATA)
#endif
#
-# the upstart job file
-#
-
-upstart_jobsdir = $(datadir)/upstart/sessions
-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)
-
-#
# the xdg autostart job file
#
@@ -55,4 +32,3 @@ EXTRA_DIST += $(xdg_autostart_in)
DISTCLEANFILES = \
Makefile.in
-
diff --git a/data/ayatana-indicator-printers.conf.in b/data/ayatana-indicator-printers.conf.in
deleted file mode 100644
index 7f1f79a..0000000
--- a/data/ayatana-indicator-printers.conf.in
+++ /dev/null
@@ -1,12 +0,0 @@
-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/ayatana-indicator-printers.override b/data/ayatana-indicator-printers.override
deleted file mode 100644
index 2905494..0000000
--- a/data/ayatana-indicator-printers.override
+++ /dev/null
@@ -1 +0,0 @@
-manual
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
deleted file mode 100644
index 4066aa6..0000000
--- a/data/upstart/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-BUILT_SOURCES=
-CLEANFILES=
-EXTRA_DIST=
-
-#
-# the upstart xdg autostart override
-#
-
-xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-xdg_autostart_DATA = ayatana-indicator-printers.desktop
-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
-$(xdg_autostart_DATA): $(xdg_autostart_in)
- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(xdg_autostart_DATA)
-CLEANFILES += $(xdg_autostart_DATA)
-EXTRA_DIST += $(xdg_autostart_in)
diff --git a/data/upstart/ayatana-indicator-printers.desktop.in b/data/upstart/ayatana-indicator-printers.desktop.in
deleted file mode 100644
index f0045dc..0000000
--- a/data/upstart/ayatana-indicator-printers.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Printers
-Exec=@pkglibexecdir@/ayatana-indicator-printers-service
-OnlyShowIn=MATE;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true