aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 09:04:26 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 09:04:26 +0200
commitdea0206e79fc818fed7d3b2ec7520bed42c53801 (patch)
tree53fac2e752b235d5855bba7938915ed6787fdcb4
parentacc3b1a54e91ba82765cd12b05e7d5d02e963c02 (diff)
parentbda49567cf56194aeeb937e0542158bf5f5888f7 (diff)
downloadayatana-indicator-display-dea0206e79fc818fed7d3b2ec7520bed42c53801.tar.gz
ayatana-indicator-display-dea0206e79fc818fed7d3b2ec7520bed42c53801.tar.bz2
ayatana-indicator-display-dea0206e79fc818fed7d3b2ec7520bed42c53801.zip
Merge branch 'ubports-fix-systemd'
Attributes GH PR #2: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/2
-rw-r--r--data/ayatana-indicator-display.service.in5
-rw-r--r--debian/ayatana-indicator-display.links2
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules2
4 files changed, 8 insertions, 2 deletions
diff --git a/data/ayatana-indicator-display.service.in b/data/ayatana-indicator-display.service.in
index 3d63d97..cdfc1e0 100644
--- a/data/ayatana-indicator-display.service.in
+++ b/data/ayatana-indicator-display.service.in
@@ -1,8 +1,11 @@
[Unit]
Description=Ayatana Indicator Display Backend
PartOf=graphical-session.target
-After=ayatana-indicators-pre.target
+PartOf=ayatana-indicators.target
[Service]
ExecStart=@pkglibexecdir@/ayatana-indicator-display-service
Restart=on-failure
+
+[Install]
+WantedBy=ayatana-indicators.target
diff --git a/debian/ayatana-indicator-display.links b/debian/ayatana-indicator-display.links
new file mode 100644
index 0000000..b5d4c0b
--- /dev/null
+++ b/debian/ayatana-indicator-display.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-display.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-display.service
diff --git a/debian/control b/debian/control
index d244612..908046b 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: cmake,
googletest | google-mock (>= 1.6.0+svn437),
# for packaging
debhelper (>= 9),
+ dh-systemd,
# for systemd unit
systemd [linux-any],
Standards-Version: 4.1.1
diff --git a/debian/rules b/debian/rules
index 4ff937e..d3e74c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
%:
- dh $@ --parallel
+ dh $@ --parallel --with systemd
get-orig-source:
uscan --noconf --force-download --rename --download-current-version --destdir=..