Indicator keyboard

Merge lp:~ted/indicator-keyboard/systemd-unit into lp:indicator-keyboard

  1. systemd-unit
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Approved by: Martin Pitt
Approved revision: 1029
Merged at revision: 1117
Proposed branch: lp:~ted/indicator-keyboard/systemd-unit
Merge into: lp:indicator-keyboard
Diff against target: 84 lines (+29/-1)
5 files modified
configure.ac (+3/-0)
data/Makefile.am (+15/-1)
data/indicator-keyboard.override (+1/-0)
data/indicator-keyboard.service.in (+8/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~ted/indicator-keyboard/systemd-unit
Reviewer Review Type Date Requested Status
Martin Pitt Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+300426@code.launchpad.net

Commit message

Adding systemd user session unit

Description of the change

Woot, we're on our way!

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

Adding a restart rule

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

LGTM and works fine, thanks!

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 2015-11-25 08:31:33 +0000
3+++ configure.ac 2016-07-20 06:58:19 +0000
4@@ -47,6 +47,9 @@
5 PKG_CHECK_MODULES([ACCOUNTSSERVICE], [accountsservice])
6 PKG_CHECK_MODULES([LIGHTDM], [liblightdm-gobject-1])
7
8+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
9+AC_SUBST(SYSTEMD_USERDIR)
10+
11 m4_include([m4/gcov.m4])
12 AC_TDD_GCOV
13 AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
14
15=== modified file 'data/Makefile.am'
16--- data/Makefile.am 2015-11-25 08:31:33 +0000
17+++ data/Makefile.am 2016-07-20 06:58:19 +0000
18@@ -60,6 +60,19 @@
19 $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
20
21 ###########################
22+# Systemd configuration
23+###########################
24+
25+%.service: %.service.in
26+ $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
27+
28+systemddir = $(SYSTEMD_USERDIR)
29+systemd_DATA = indicator-keyboard.service
30+
31+upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
32+upstartsystemdoverride_DATA = indicator-keyboard.override
33+
34+###########################
35 # Indicator Config
36 ###########################
37
38@@ -102,5 +115,6 @@
39 $(dist_indicator_DATA) \
40 $(gsettings_SCHEMAS) \
41 indicator-keyboard.conf.in \
42- indicator-keyboard.desktop.in
43+ indicator-keyboard.desktop.in \
44+ indicator-keyboard.service.in
45
46
47=== added file 'data/indicator-keyboard.override'
48--- data/indicator-keyboard.override 1970-01-01 00:00:00 +0000
49+++ data/indicator-keyboard.override 2016-07-20 06:58:19 +0000
50@@ -0,0 +1,1 @@
51+manual
52
53=== added file 'data/indicator-keyboard.service.in'
54--- data/indicator-keyboard.service.in 1970-01-01 00:00:00 +0000
55+++ data/indicator-keyboard.service.in 2016-07-20 06:58:19 +0000
56@@ -0,0 +1,8 @@
57+[Unit]
58+Description=Indicator Keyboard Backend
59+PartOf=graphical-session.target
60+After=indicators-pre.target
61+
62+[Service]
63+ExecStart=@pkglibexecdir@/indicator-keyboard-service --use-gtk
64+Restart=on-failure
65
66=== modified file 'debian/control'
67--- debian/control 2015-11-25 08:45:32 +0000
68+++ debian/control 2016-07-20 06:58:19 +0000
69@@ -20,6 +20,7 @@
70 valac,
71 xauth,
72 xvfb,
73+ systemd,
74 Standards-Version: 3.9.4
75 Homepage: https://code.launchpad.net/indicator-keyboard
76 # If you aren't a member of ~indicator-applet-developers but need to upload
77@@ -33,6 +34,7 @@
78 Depends: ${misc:Depends},
79 ${shlibs:Depends},
80 libgnomekbd-common,
81+ indicator-common,
82 Breaks: ibus (<< 1.5.5-1ubuntu3),
83 Description: Keyboard indicator
84 This package contains the keyboard indicator, which should show as an icon in

Subscribers

People subscribed via source and target branches

to all changes: