aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 08:49:59 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 08:49:59 +0200
commitb1ad97815a3ca28361f731305d5367645de6226d (patch)
tree84a912beb9bf3ff48a5960c50bb8b777426fc643
parent09e84775b56615f39e11313949f06fc7a1e885a8 (diff)
parentc011884c8912fb8245584cd46b2ef30022ac8133 (diff)
downloadayatana-indicator-power-b1ad97815a3ca28361f731305d5367645de6226d.tar.gz
ayatana-indicator-power-b1ad97815a3ca28361f731305d5367645de6226d.tar.bz2
ayatana-indicator-power-b1ad97815a3ca28361f731305d5367645de6226d.zip
Merge branch 'ubports-fix-systemd'
Attributs GH PR #7: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/7
-rw-r--r--data/ayatana-indicator-power.service.in5
-rw-r--r--debian/ayatana-indicator-power.links2
-rwxr-xr-xdebian/rules2
3 files changed, 7 insertions, 2 deletions
diff --git a/data/ayatana-indicator-power.service.in b/data/ayatana-indicator-power.service.in
index 90ea9e6..dafac52 100644
--- a/data/ayatana-indicator-power.service.in
+++ b/data/ayatana-indicator-power.service.in
@@ -1,8 +1,11 @@
[Unit]
Description=Ayatana Indicator Power
PartOf=graphical-session.target
-After=ayatana-indicators-pre.target
+PartOf=ayatana-indicators.target
[Service]
ExecStart=@pkglibexecdir@/ayatana-indicator-power-service
Restart=on-failure
+
+[Install]
+WantedBy=ayatana-indicators.target
diff --git a/debian/ayatana-indicator-power.links b/debian/ayatana-indicator-power.links
new file mode 100644
index 0000000..df9db33
--- /dev/null
+++ b/debian/ayatana-indicator-power.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-power.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-power.service
diff --git a/debian/rules b/debian/rules
index ddfbd41..73b8d09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
%:
- dh $@
+ dh $@ --with systemd
override_dh_install:
find debian/ayatana-indicator-power -name \*.la -delete