diff options
| author | Robert Tari <robert@tari.in> | 2020-08-11 09:51:32 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2020-08-11 09:51:32 +0200 |
| commit | b1e8aa8b40075f8f90644295af77570de9a5637a (patch) | |
| tree | 75491166c032b32412cf4d06c326b92fe4750478 | |
| parent | fa891fc76c7108a4cc4bcdad5d2abb5f2a83d233 (diff) | |
| parent | 707fd989f4612c1ef3a504f13c7f4582ed3b798e (diff) | |
| download | ayatana-indicator-printers-b1e8aa8b40075f8f90644295af77570de9a5637a.tar.gz ayatana-indicator-printers-b1e8aa8b40075f8f90644295af77570de9a5637a.tar.bz2 ayatana-indicator-printers-b1e8aa8b40075f8f90644295af77570de9a5637a.zip | |
Merge branch 'sunweaver-pr/fix-systemd'
Attributes GH PR #4: https://github.com/AyatanaIndicators/ayatana-indicator-printers/pull/4
| -rw-r--r-- | data/ayatana-indicator-printers.service.in | 5 | ||||
| -rw-r--r-- | debian/ayatana-indicator-printers.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-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 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/control b/debian/control index d055c07..d7dfb4d 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 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), 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 |