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

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

Commit message

WIP

To post a comment you must log in.

Unmerged revisions

311. 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-power.service.in'
2--- data/indicator-power.service.in 2016-07-20 06:57:56 +0000
3+++ data/indicator-power.service.in 2017-04-03 21:18:53 +0000
4@@ -1,8 +1,11 @@
5 [Unit]
6 Description=Indicator Power
7 PartOf=graphical-session.target
8-After=indicators-pre.target
9+PartOf=indicators.target
10
11 [Service]
12 ExecStart=@pkglibexecdir@/indicator-power-service
13 Restart=on-failure
14+
15+[Install]
16+WantedBy=indicators.target
17
18=== modified file 'debian/control'
19--- debian/control 2017-02-07 20:19:15 +0000
20+++ debian/control 2017-04-03 21:18:53 +0000
21@@ -5,6 +5,7 @@
22 Build-Depends: cmake,
23 cmake-extras (>= 0.10),
24 debhelper (>= 9),
25+ dh-systemd,
26 dh-translations,
27 gcovr,
28 intltool,
29
30=== added file 'debian/indicator-power.links'
31--- debian/indicator-power.links 1970-01-01 00:00:00 +0000
32+++ debian/indicator-power.links 2017-04-03 21:18:53 +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-power.service /usr/lib/systemd/user/indicators.target.wants/indicator-power.service
36
37=== modified file 'debian/rules'
38--- debian/rules 2014-07-16 23:28:24 +0000
39+++ debian/rules 2017-04-03 21:18:53 +0000
40@@ -7,7 +7,7 @@
41 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
42
43 %:
44- dh $@ --with translations
45+ dh $@ --with systemd,translations
46
47 override_dh_install:
48 find debian/indicator-power -name \*.la -delete

Subscribers

People subscribed via source and target branches