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

[Michael Terry]

WIP

Unmerged revisions

311. By Michael Terry on 2017-04-03

Start indicator in systemd when indicators.target is started

=== modified file 'data/indicator-power.service.in'
--- data/indicator-power.service.in	2016-07-20 06:57:56 +0000
+++ data/indicator-power.service.in	2017-04-03 21:18:53 +0000
@@ -1,8 +1,11 @@
 [Unit]
 Description=Indicator Power
 PartOf=graphical-session.target
-After=indicators-pre.target
+PartOf=indicators.target
 
 [Service]
 ExecStart=@pkglibexecdir@/indicator-power-service
 Restart=on-failure
+
+[Install]
+WantedBy=indicators.target
 
=== modified file 'debian/control'
--- debian/control	2017-02-07 20:19:15 +0000
+++ debian/control	2017-04-03 21:18:53 +0000
@@ -5,6 +5,7 @@
 Build-Depends: cmake,
                cmake-extras (>= 0.10),
                debhelper (>= 9),
+               dh-systemd,
                dh-translations,
                gcovr,
                intltool,
 
=== added file 'debian/indicator-power.links'
--- debian/indicator-power.links	1970-01-01 00:00:00 +0000
+++ debian/indicator-power.links	2017-04-03 21:18:53 +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-power.service /usr/lib/systemd/user/indicators.target.wants/indicator-power.service
 
=== modified file 'debian/rules'
--- debian/rules	2014-07-16 23:28:24 +0000
+++ debian/rules	2017-04-03 21:18:53 +0000
@@ -7,7 +7,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with translations
+	dh $@ --with systemd,translations
 
 override_dh_install:
 	find debian/indicator-power -name \*.la -delete