From 42358cc35ebf50629ec431ddbc1608daa6fc5499 Mon Sep 17 00:00:00 2001 From: Marius Gripsgard Date: Sun, 9 Aug 2020 21:56:14 +0200 Subject: Use indicators.target as the systemd lifecycle unit Use indicators.target as the systemd lifecycle unit, not indicators-pre.target. Patch from: https://code.launchpad.net/~mterry/libindicator/rename-unit/+merge/321556 --- data/Makefile.am | 2 +- data/ayatana-indicators-pre.target | 2 -- data/ayatana-indicators.target | 7 +++++++ debian/ayatana-indicator-common.links | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 data/ayatana-indicators-pre.target create mode 100644 data/ayatana-indicators.target create mode 100644 debian/ayatana-indicator-common.links 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-pre.target deleted file mode 100644 index 6ce241f..0000000 --- a/data/ayatana-indicators-pre.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Target representing the lifecycle of the Ayatana Indicators. Each indicator should be bound to it in its individual service file. diff --git a/data/ayatana-indicators.target b/data/ayatana-indicators.target new file mode 100644 index 0000000..0dce2e9 --- /dev/null +++ b/data/ayatana-indicators.target @@ -0,0 +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 -- cgit v1.2.3