From 1f1d0415d9b52404420be98d946a64c1cc0e0a32 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Aug 2020 11:30:50 +0200 Subject: Start indicator in systemd when ayatana-indicators.target is started. --- data/ayatana-indicator-printers.service.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/ayatana-indicator-printers.service.in b/data/ayatana-indicator-printers.service.in index e3d4fec..781f3e6 100644 --- a/data/ayatana-indicator-printers.service.in +++ b/data/ayatana-indicator-printers.service.in @@ -1,8 +1,11 @@ [Unit] Description=Ayatana Indicator Printers Service PartOf=graphical-session.target -After=ayatana-indicators-pre.target +PartOf=ayatana-indicators.target [Service] ExecStart=@pkglibexecdir@/ayatana-indicator-printers-service Restart=on-failure + +[Install] +WantedBy=ayatana-indicators.target -- cgit v1.2.3 From 90d24dec1477bea8a7eee6cb28f5daeefb199c70 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Aug 2020 11:31:19 +0200 Subject: debian/control: B-D on dh-systemd (or recent enough debhelper version). --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index d055c07..d7dfb4d 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf | debhelper (>= 9.20160403~), + dh-systemd | debhelper (>= 10.2~), dpkg-dev (>= 1.16.1.1), mate-common, libglib2.0-dev (>= 2.43.2), -- cgit v1.2.3 From 707fd989f4612c1ef3a504f13c7f4582ed3b798e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Aug 2020 11:31:55 +0200 Subject: debian/{rules,*.links}: Install systemd user service file into DEB package. --- debian/ayatana-indicator-printers.links | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 debian/ayatana-indicator-printers.links diff --git a/debian/ayatana-indicator-printers.links b/debian/ayatana-indicator-printers.links new file mode 100644 index 0000000..ff077cb --- /dev/null +++ b/debian/ayatana-indicator-printers.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-printers.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-printers.service diff --git a/debian/rules b/debian/rules index c339196..ba2e36f 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: - dh $@ --without autoreconf + dh $@ --without autoreconf,systemd override_dh_auto_configure: NOCONFIGURE=1 ./autogen.sh -- cgit v1.2.3