Merge lp:~mterry/indicator-datetime/systemd-lifecycle into lp:indicator-datetime

[Michael Terry]

WIP

Unmerged revisions

485. By Michael Terry on 2017-04-03

Support indicators.target systemd lifecycle

=== modified file 'data/indicator-datetime.service.in'
--- data/indicator-datetime.service.in	2016-10-19 09:36:20 +0000
+++ data/indicator-datetime.service.in	2017-04-03 18:21:26 +0000
@@ -1,8 +1,11 @@
 [Unit]
 Description=Indicator Date & Time Backend
 PartOf=graphical-session.target
-After=indicators-pre.target
+PartOf=indicators.target
 
 [Service]
 ExecStart=@pkglibexecdir@/indicator-datetime-service
 Restart=on-failure
+
+[Install]
+WantedBy=indicators.target

=== modified file 'debian/control'
--- debian/control	2017-02-27 14:29:11 +0000
+++ debian/control	2017-04-03 18:21:26 +0000
@@ -6,6 +6,7 @@
                cmake-extras (>= 1.1),
                dbus,
                debhelper (>= 9), 
+               dh-systemd,
                dh-translations,
                gcovr,
                intltool,

=== added file 'debian/indicator-datetime.links'
--- debian/indicator-datetime.links	1970-01-01 00:00:00 +0000
+++ debian/indicator-datetime.links	2017-04-03 18:21:26 +0000
@@ -0,0 +1,2 @@
+# Because dh-systemd does not yet support user units, we manually make the WantedBy link
+/usr/lib/systemd/user/indicator-datetime.service /usr/lib/systemd/user/indicators.target.wants/indicator-datetime.service

=== modified file 'debian/rules'
--- debian/rules	2015-07-15 18:24:13 +0000
+++ debian/rules	2017-04-03 18:21:26 +0000
@@ -3,7 +3,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@ --with translations
+	dh $@ --with systemd,translations
 
 override_dh_install:
 	dh_install --fail-missing