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

[Michael Terry]

WIP

Unmerged revisions

108. By Michael Terry on 2017-04-03

Start indicator in systemd when indicators.target is started

=== modified file 'data/indicator-bluetooth.service.in'
--- data/indicator-bluetooth.service.in	2016-10-22 09:06:54 +0000
+++ data/indicator-bluetooth.service.in	2017-04-03 21:11:43 +0000
@@ -1,8 +1,11 @@
 [Unit]
 Description=Indicator Bluetooth Backend
 PartOf=graphical-session.target
-After=indicators-pre.target
+PartOf=indicators.target
 
 [Service]
 ExecStart=@pkglibexecdir@/indicator-bluetooth-service
 Restart=on-failure
+
+[Install]
+WantedBy=indicators.target
 
=== modified file 'debian/control'
--- debian/control	2016-07-19 07:35:00 +0000
+++ debian/control	2017-04-03 21:11:43 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper (>= 9.0),
                dh-autoreconf,
+               dh-systemd,
                dh-translations,
                gnome-common,
                libglib2.0-dev,
 
=== added file 'debian/indicator-bluetooth.links'
--- debian/indicator-bluetooth.links	1970-01-01 00:00:00 +0000
+++ debian/indicator-bluetooth.links	2017-04-03 21:11:43 +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-bluetooth.service /usr/lib/systemd/user/indicators.target.wants/indicator-bluetooth.service
 
=== modified file 'debian/rules'
--- debian/rules	2013-01-31 17:19:41 +0000
+++ debian/rules	2017-04-03 21:11:43 +0000
@@ -3,7 +3,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with translations,autoreconf
+	dh $@ --with autoreconf,systemd,translations
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh