From bcd0095dcfe96c49c3079d9e22752e1e7e5857fe Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Aug 2020 12:05:40 +0200 Subject: Start indicator in systemd when ayatana-indicators.target is started. --- data/ayatana-indicator-application.service.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/ayatana-indicator-application.service.in b/data/ayatana-indicator-application.service.in index b1068d0..3435853 100644 --- a/data/ayatana-indicator-application.service.in +++ b/data/ayatana-indicator-application.service.in @@ -1,8 +1,11 @@ [Unit] Description=Ayatana Indicator Application Service PartOf=graphical-session.target -After=ayatana-indicators-pre.target +PartOf=ayatana-indicators.target [Service] ExecStart=@pkglibexecdir@/ayatana-indicator-application-service Restart=on-failure + +[Install] +WantedBy=ayatana-indicators.target -- cgit v1.2.3 From ac816c04496b2ba5152cbb15d07c4ddfa75e6bf8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Aug 2020 12:06:04 +0200 Subject: debian/*: Install systemd user service file correctly into DEB package. --- debian/ayatana-indicator-application.links | 3 +++ debian/control | 1 + debian/rules | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 debian/ayatana-indicator-application.links diff --git a/debian/ayatana-indicator-application.links b/debian/ayatana-indicator-application.links new file mode 100644 index 0000000..c4581ab --- /dev/null +++ b/debian/ayatana-indicator-application.links @@ -0,0 +1,3 @@ +# Because dh-systemd does not support user units for compat levels below 12, we manually make the WantedBy link +# FIXME: drop this once we bump DH compat level to 12 or higher +/usr/lib/systemd/user/ayatana-indicator-application.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-application.service diff --git a/debian/control b/debian/control index ebcc2b7..42fd4b7 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9.0), dh-autoreconf | debhelper (>= 9.20160403~), + dh-systemd | debhelper (>= 10.2~), dbus-test-runner, mate-common, xvfb, diff --git a/debian/rules b/debian/rules index 6310980..c7aa8a6 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --with autoreconf + dh $@ --with autoreconf,systemd override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh -- cgit v1.2.3