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

[Michael Terry]

WIP

Unmerged revisions

554. By Michael Terry on 2017-04-03

Start indicator in systemd when indicators.target is started

=== modified file 'data/indicator-sound.service.in'
--- data/indicator-sound.service.in	2016-07-20 06:57:58 +0000
+++ data/indicator-sound.service.in	2017-04-03 21:34:49 +0000
@@ -1,8 +1,11 @@
 [Unit]
 Description=Indicator Sound Service
 PartOf=graphical-session.target
-After=indicators-pre.target
+PartOf=indicators.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
 Restart=on-failure
+
+[Install]
+WantedBy=indicators.target
 
=== modified file 'debian/control'
--- debian/control	2017-02-07 22:04:35 +0000
+++ debian/control	2017-04-03 21:34:49 +0000
@@ -8,6 +8,7 @@
                cmake-extras (>= 0.10),
                dbus,
                dbus-test-runner (>> 14.04.0+14.04.20150120.1),
+               dh-systemd,
                dh-translations,
                gcovr,
                gir1.2-accountsservice-1.0,
 
=== added file 'debian/indicator-sound.links'
--- debian/indicator-sound.links	1970-01-01 00:00:00 +0000
+++ debian/indicator-sound.links	2017-04-03 21:34:49 +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-sound.service /usr/lib/systemd/user/indicators.target.wants/indicator-sound.service
 
=== modified file 'debian/rules'
--- debian/rules	2015-02-04 20:43:51 +0000
+++ debian/rules	2017-04-03 21:34:49 +0000
@@ -3,7 +3,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --parallel --fail-missing --with translations
+	dh $@ --parallel --fail-missing --with systemd,translations
 
 override_dh_auto_configure:
 	# Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.