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

[Michael Terry]

WIP

Unmerged revisions

490. By Michael Terry on 2017-04-03

Add dh-systemd for xenial

489. By Michael Terry on 2017-04-03

Use indicator.targets to launch us in systemd

=== modified file 'data/indicator-session.service.in'
--- data/indicator-session.service.in	2016-07-20 06:57:58 +0000
+++ data/indicator-session.service.in	2017-04-03 14:06:32 +0000
@@ -1,8 +1,11 @@
 [Unit]
 Description=Indicator Session Service
 PartOf=graphical-session.target
-After=indicators-pre.target
+PartOf=indicators.target
 
 [Service]
 ExecStart=@pkglibexecdir@/indicator-session-service
 Restart=on-failure
+
+[Install]
+WantedBy=indicators.target

=== modified file 'debian/control'
--- debian/control	2017-03-10 16:24:52 +0000
+++ debian/control	2017-04-03 14:06:32 +0000
@@ -6,6 +6,7 @@
                cmake-extras (>= 1.3),
                dbus,
                debhelper (>= 9),
+               dh-systemd,
                dh-translations,
                gcovr,
                googletest | google-mock,

=== added file 'debian/indicator-session.links'
--- debian/indicator-session.links	1970-01-01 00:00:00 +0000
+++ debian/indicator-session.links	2017-04-03 14:06:32 +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-session.service /usr/lib/systemd/user/indicators.target.wants/indicator-session.service

=== modified file 'debian/rules'
--- debian/rules	2017-02-08 14:36:23 +0000
+++ debian/rules	2017-04-03 14:06:32 +0000
@@ -3,7 +3,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with translations
+	dh $@ --with systemd,translations
 
 override_dh_install:
 	find debian/indicator-session/usr/lib -name *.la -delete