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

Proposed by Michael Terry on 2017-04-03
Status: Work in progress
Proposed branch: lp:~mterry/indicator-sound/systemd-lifecycle
Merge into: lp:indicator-sound
Diff against target: 48 lines (+8/-2)
4 files modified
data/indicator-sound.service.in (+4/-1)
debian/control (+1/-0)
debian/indicator-sound.links (+2/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-sound/systemd-lifecycle
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2017-04-03 Pending
Review via email: mp+321790@code.launchpad.net

Commit message

WIP

To post a comment you must log in.

Unmerged revisions

554. By Michael Terry on 2017-04-03

Start indicator in systemd when indicators.target is started

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-sound.service.in'
2--- data/indicator-sound.service.in 2016-07-20 06:57:58 +0000
3+++ data/indicator-sound.service.in 2017-04-03 21:34:49 +0000
4@@ -1,8 +1,11 @@
5 [Unit]
6 Description=Indicator Sound Service
7 PartOf=graphical-session.target
8-After=indicators-pre.target
9+PartOf=indicators.target
10
11 [Service]
12 ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
13 Restart=on-failure
14+
15+[Install]
16+WantedBy=indicators.target
17
18=== modified file 'debian/control'
19--- debian/control 2017-02-07 22:04:35 +0000
20+++ debian/control 2017-04-03 21:34:49 +0000
21@@ -8,6 +8,7 @@
22 cmake-extras (>= 0.10),
23 dbus,
24 dbus-test-runner (>> 14.04.0+14.04.20150120.1),
25+ dh-systemd,
26 dh-translations,
27 gcovr,
28 gir1.2-accountsservice-1.0,
29
30=== added file 'debian/indicator-sound.links'
31--- debian/indicator-sound.links 1970-01-01 00:00:00 +0000
32+++ debian/indicator-sound.links 2017-04-03 21:34:49 +0000
33@@ -0,0 +1,2 @@
34+# Because dh-systemd does not yet support user units, we manually make the WantedBy link
35+/usr/lib/systemd/user/indicator-sound.service /usr/lib/systemd/user/indicators.target.wants/indicator-sound.service
36
37=== modified file 'debian/rules'
38--- debian/rules 2015-02-04 20:43:51 +0000
39+++ debian/rules 2017-04-03 21:34:49 +0000
40@@ -3,7 +3,7 @@
41 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
42
43 %:
44- dh $@ --parallel --fail-missing --with translations
45+ dh $@ --parallel --fail-missing --with systemd,translations
46
47 override_dh_auto_configure:
48 # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.

Subscribers

People subscribed via source and target branches