Application Indicators

Merge lp:~ted/indicator-application/systemd-unit into lp:indicator-application/16.10

  1. systemd-unit
  2. Merge into trunk.16.10
Proposed by Ted Gould
Status: Merged
Approved by: Martin Pitt
Approved revision: 259
Merged at revision: 255
Proposed branch: lp:~ted/indicator-application/systemd-unit
Merge into: lp:indicator-application/16.10
Diff against target: 87 lines (+28/-1)
5 files modified
configure.ac (+4/-0)
data/Makefile.am (+13/-1)
data/indicator-application.override (+1/-0)
data/indicator-application.service.in (+8/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~ted/indicator-application/systemd-unit
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: [email protected]

Commit message

Adding a systemd user unit

Description of the change

We're gonna have a systemd user session!

To post a comment you must log in.
lp:~ted/indicator-application/systemd-unit updated
256. By Ted Gould

Adding an after clause to ensure they start before us

257. By Ted Gould

Restructuring our dependencies

258. By Ted Gould

Adding systemd as a build depend and indicator-common as a runtime one

259. By Ted Gould

Adding a restart rule

Revision history for this message
Martin Pitt (pitti) wrote :

LGTM, and works well, thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2014-02-20 03:27:31 +0000
3+++ configure.ac 2016-07-20 06:58:58 +0000
4@@ -48,6 +48,9 @@
5 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
6 PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
7
8+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
9+AC_SUBST(SYSTEMD_USERDIR)
10+
11 ###########################
12 # gcov coverage reporting
13 ###########################
14@@ -111,4 +114,5 @@
15 Prefix: $prefix
16 Indicator Dir: $INDICATORDIR
17 gcov: $use_gcov
18+ systemd unit: $SYSTEMD_USERDIR
19 ])
20
21=== modified file 'data/Makefile.am'
22--- data/Makefile.am 2014-02-20 20:48:59 +0000
23+++ data/Makefile.am 2016-07-20 06:58:58 +0000
24@@ -16,12 +16,24 @@
25 overridedir = $(pkgdatadir)
26 override_DATA = ordering-override.keyfile
27
28+%.service: %.service.in
29+ $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
30+
31+systemddir = $(SYSTEMD_USERDIR)
32+systemd_DATA = indicator-application.service
33+
34+upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
35+upstartsystemdoverride_DATA = indicator-application.override
36+
37 EXTRA_DIST = \
38 indicator-application.desktop.in \
39 indicator-application.conf.in \
40+ indicator-application.service.in \
41+ indicator-application.override \
42 ordering-override.keyfile
43
44 CLEANFILES = \
45 indicator-application.conf \
46- indicator-application.desktop
47+ indicator-application.desktop \
48+ indicator-application.service
49
50
51=== added file 'data/indicator-application.override'
52--- data/indicator-application.override 1970-01-01 00:00:00 +0000
53+++ data/indicator-application.override 2016-07-20 06:58:58 +0000
54@@ -0,0 +1,1 @@
55+manual
56
57=== added file 'data/indicator-application.service.in'
58--- data/indicator-application.service.in 1970-01-01 00:00:00 +0000
59+++ data/indicator-application.service.in 2016-07-20 06:58:58 +0000
60@@ -0,0 +1,8 @@
61+[Unit]
62+Description=Indicator Application Service
63+PartOf=graphical-session.target
64+After=indicators-pre.target
65+
66+[Service]
67+ExecStart=@pkglibexecdir@/indicator-application-service
68+Restart=on-failure
69
70=== modified file 'debian/control'
71--- debian/control 2014-03-21 16:21:44 +0000
72+++ debian/control 2016-07-20 06:58:58 +0000
73@@ -17,6 +17,7 @@
74 libindicator3-dev (>= 0.3.90),
75 libdbusmenu-glib-dev (>= 0.5.90),
76 libdbusmenu-gtk3-dev (>= 0.5.90),
77+ systemd,
78 Standards-Version: 3.9.3
79 Homepage: https://launchpad.net/indicator-application
80 # If you aren't a member of ~indicator-applet-developers but need to upload
81@@ -29,6 +30,7 @@
82 Architecture: any
83 Depends: ${shlibs:Depends},
84 ${misc:Depends},
85+ indicator-common,
86 Description: Application Indicators
87 An indicator to take menus from applications and place them in the panel.
88

Subscribers

People subscribed via source and target branches