aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 09:01:56 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 09:01:56 +0200
commit664a2351b15fbc42f9a5d1dc4877dc7e1ee54b48 (patch)
tree7065fd96d1783cccec6f2db5b956bd2996396068
parent37cd597a495c0aa1c404df9bc18b1af899441a94 (diff)
parent94ffb27239ba1710ee10afd1949b7e7acb1cfd7d (diff)
downloadayatana-indicator-sound-664a2351b15fbc42f9a5d1dc4877dc7e1ee54b48.tar.gz
ayatana-indicator-sound-664a2351b15fbc42f9a5d1dc4877dc7e1ee54b48.tar.bz2
ayatana-indicator-sound-664a2351b15fbc42f9a5d1dc4877dc7e1ee54b48.zip
Merge branch 'ubports-fix-systemd'
Attributes GH PR #7: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/7
-rw-r--r--data/ayatana-indicator-sound.service.in5
-rw-r--r--debian/ayatana-indicator-sound.links2
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules2
4 files changed, 8 insertions, 2 deletions
diff --git a/data/ayatana-indicator-sound.service.in b/data/ayatana-indicator-sound.service.in
index afb6b28..b6c0c33 100644
--- a/data/ayatana-indicator-sound.service.in
+++ b/data/ayatana-indicator-sound.service.in
@@ -1,8 +1,11 @@
[Unit]
Description=Ayatana Indicator Sound Service
PartOf=graphical-session.target
-After=ayatana-indicators-pre.target
+PartOf=ayatana-indicators.target
[Service]
ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service
Restart=on-failure
+
+[Install]
+WantedBy=ayatana-indicators.target
diff --git a/debian/ayatana-indicator-sound.links b/debian/ayatana-indicator-sound.links
new file mode 100644
index 0000000..afd6c9f
--- /dev/null
+++ b/debian/ayatana-indicator-sound.links
@@ -0,0 +1,2 @@
+# Because dh-systemd does not yet support user units, we manually make the WantedBy link
+/usr/lib/systemd/user/ayatana-indicator-sound.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-sound.service
diff --git a/debian/control b/debian/control
index 92d9fd7..de3c368 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: sound
Priority: optional
Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Build-Depends: debhelper (>= 9.0),
+ dh-systemd,
cmake,
cmake-extras (>= 0.10),
dbus,
diff --git a/debian/rules b/debian/rules
index 0cc5145..276a29d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DPKG_GENSYMBOLS_CHECK_LEVEL=4
%:
- dh $@ --parallel --fail-missing
+ dh $@ --parallel --fail-missing --with systemd
override_dh_auto_configure:
# Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.