aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 08:45:41 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-10 08:45:41 +0200
commit985f4926c4620ae156b89bf9be9d19bb92a50e66 (patch)
tree0923a188e28adc1e1ab0635a87da7d4adc52dd38
parent7ceee62eb53671e2dd5211ca693e47877b55f2dd (diff)
parent42358cc35ebf50629ec431ddbc1608daa6fc5499 (diff)
downloadlibayatana-indicator-985f4926c4620ae156b89bf9be9d19bb92a50e66.tar.gz
libayatana-indicator-985f4926c4620ae156b89bf9be9d19bb92a50e66.tar.bz2
libayatana-indicator-985f4926c4620ae156b89bf9be9d19bb92a50e66.zip
Merge branch 'ubports-fix-systemd'
Attributes GH PR #7: https://github.com/AyatanaIndicators/libayatana-indicator/pull/7
-rw-r--r--data/Makefile.am2
-rw-r--r--data/ayatana-indicators.target (renamed from data/ayatana-indicators-pre.target)5
-rw-r--r--debian/ayatana-indicator-common.links2
3 files changed, 8 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 55ae3ab..c4b1255 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
#if defined(HAVE_SYSTEMD)
-systemd_DATA = ayatana-indicators-pre.target
+systemd_DATA = ayatana-indicators.target
systemddir = $(SYSTEMD_USERDIR)
EXTRA_DIST = $(systemd_DATA)
#endif
diff --git a/data/ayatana-indicators-pre.target b/data/ayatana-indicators.target
index 6ce241f..0dce2e9 100644
--- a/data/ayatana-indicators-pre.target
+++ b/data/ayatana-indicators.target
@@ -1,2 +1,7 @@
[Unit]
Description=Target representing the lifecycle of the Ayatana Indicators. Each indicator should be bound to it in its individual service file.
+PartOf=graphical-session.target
+
+[Install]
+# Old name for this target, kept for compatibility
+Alias=ayatana-indicators-pre.target
diff --git a/debian/ayatana-indicator-common.links b/debian/ayatana-indicator-common.links
new file mode 100644
index 0000000..160004b
--- /dev/null
+++ b/debian/ayatana-indicator-common.links
@@ -0,0 +1,2 @@
+# Because dh-systemd does not yet support user units, we manually make the Alias link
+/usr/lib/systemd/user/ayatana-indicators.target /usr/lib/systemd/user/ayatana-indicators-pre.target