libindicator

Merge lp:~mterry/libindicator/rename-unit into lp:libindicator

  1. rename-unit
  2. Merge into trunk.16.10
Proposed by Michael Terry
Status: Needs review
Proposed branch: lp:~mterry/libindicator/rename-unit
Merge into: lp:libindicator
Diff against target: 42 lines (+14/-1)
4 files modified
data/Makefile.am (+1/-1)
data/indicators.target (+5/-0)
debian/changelog (+6/-0)
debian/indicator-common.links (+2/-0)
To merge this branch: bzr merge lp:~mterry/libindicator/rename-unit
Reviewer Review Type Date Requested Status
Ted Gould Pending
Indicator Applet Developers Pending
Review via email: mp+321556@code.launchpad.net

Commit message

Use indicators.target as the systemd lifecycle unit, not indicators-pre.target.

Description of the change

This MP might just be my inexperience with systemd conventions, but I think "indicators.target" makes more sense than "indicators-pre.target"?

With this MP, indicators can do the following:

[Unit]
PartOf=indicators.target
[Install]
WantedBy=indicators.target

And then they will start, restart, and stop when indicators.target is. And unity8 can simply say Wants=indicators.target when it starts up (or manually start it, whatever).

Indicators don't seem to be started by anything now, but I plan to add the above stanza to indicators if this branch is liked.

Is indicators-pre.target separately valuable? The "-pre" stuff seems used elsewhere (like in graphical-session), but I'm not sure why we want it for indicators.

To post a comment you must log in.
lp:~mterry/libindicator/rename-unit updated
538. By Michael Terry

Make indicators.target part of graphical session

Unmerged revisions

538. By Michael Terry

Make indicators.target part of graphical session

537. By Michael Terry

Bump version

536. By Michael Terry

Rename indicators-pre.target to indicators.target

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2016-07-18 15:37:36 +0000
3+++ data/Makefile.am 2017-04-04 13:42:39 +0000
4@@ -1,4 +1,4 @@
5-systemd_DATA = indicators-pre.target
6+systemd_DATA = indicators.target
7 systemddir = $(SYSTEMD_USERDIR)
8
9 EXTRA_DIST = $(systemd_DATA)
10
11=== renamed file 'data/indicators-pre.target' => 'data/indicators.target'
12--- data/indicators-pre.target 2016-09-13 13:36:17 +0000
13+++ data/indicators.target 2017-04-04 13:42:39 +0000
14@@ -1,2 +1,7 @@
15 [Unit]
16 Description=Target representing the lifecycle of the indicators. Each indicator should be bound to it in its individual service file.
17+PartOf=graphical-session.target
18+
19+[Install]
20+# Old name for this target, kept for compatibility
21+Alias=indicators-pre.target
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2016-09-13 14:29:09 +0000
25+++ debian/changelog 2017-04-04 13:42:39 +0000
26@@ -1,3 +1,9 @@
27+libindicator (16.10.1) UNRELEASED; urgency=medium
28+
29+ * Bump version, to fix stable-phone-overlay PPA versioning
30+
31+ -- Michael Terry <mterry@ubuntu.com> Mon, 03 Apr 2017 14:27:55 -0400
32+
33 libindicator (16.10.0+16.10.20160913-0ubuntu1) yakkety; urgency=medium
34
35 [ Ted Gould ]
36
37=== added file 'debian/indicator-common.links'
38--- debian/indicator-common.links 1970-01-01 00:00:00 +0000
39+++ debian/indicator-common.links 2017-04-04 13:42:39 +0000
40@@ -0,0 +1,2 @@
41+# Because dh-systemd does not yet support user units, we manually make the Alias link
42+/usr/lib/systemd/user/indicators.target /usr/lib/systemd/user/indicators-pre.target

Subscribers

People subscribed via source and target branches