diff options
author | Robert Tari <robert@tari.in> | 2020-08-10 16:34:58 +0200 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2020-08-10 16:34:58 +0200 |
commit | 9e09aaa26e5cc9a5c628191411040bcb535afc55 (patch) | |
tree | 95e595fab5ec4ed65b20e0fbe55cec8c6b6411e0 | |
parent | 05e0a707b5b353bd8bd9645c27e5fc73eef05d23 (diff) | |
parent | ac816c04496b2ba5152cbb15d07c4ddfa75e6bf8 (diff) | |
download | ayatana-indicator-application-9e09aaa26e5cc9a5c628191411040bcb535afc55.tar.gz ayatana-indicator-application-9e09aaa26e5cc9a5c628191411040bcb535afc55.tar.bz2 ayatana-indicator-application-9e09aaa26e5cc9a5c628191411040bcb535afc55.zip |
Merge branch 'sunweaver-pr/fix-systemd'
Attributes GH PR #3: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/3
-rw-r--r-- | data/ayatana-indicator-application.service.in | 5 | ||||
-rw-r--r-- | debian/ayatana-indicator-application.links | 3 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rwxr-xr-x | debian/rules | 2 |
4 files changed, 9 insertions, 2 deletions
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 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 <mike.gabriel@das-netzwerkteam.de> 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 |