Merge lp:~ted/libindicator/systemd-unit into lp:libindicator

Proposed by Ted Gould on 2016-07-18
Status: Merged
Approved by: Ted Gould on 2016-08-23
Approved revision: 536
Merged at revision: 534
Proposed branch: lp:~ted/libindicator/systemd-unit
Merge into: lp:libindicator
Diff against target: 106 lines (+29/-0)
8 files modified
Makefile.am (+1/-0)
configure.ac (+4/-0)
data/Makefile.am (+4/-0)
data/indicators-pre.target (+2/-0)
debian/changelog (+7/-0)
debian/control (+8/-0)
debian/indicator-common.install (+1/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~ted/libindicator/systemd-unit
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-07-18 Approve on 2016-09-13
PS Jenkins bot continuous-integration Pending
Review via email: mp+300349@code.launchpad.net

Commit message

Add a systemd shared target

Description of the change

Man, the GTK2/3 build is a pain

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

the unit description is not really easy to read but changes look fine otherwise, you might need a ffe now to land it though

review: Approve
lp:~ted/libindicator/systemd-unit updated on 2016-09-13
537. By Ted Gould on 2016-09-13

Fix description to make it easier to understand

Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-04-04 02:39:27 +0000
3+++ Makefile.am 2016-09-13 13:37:15 +0000
4@@ -1,6 +1,7 @@
5 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
6
7 SUBDIRS = \
8+ data \
9 libindicator \
10 tools
11
12
13=== modified file 'configure.ac'
14--- configure.ac 2015-12-08 10:08:40 +0000
15+++ configure.ac 2016-09-13 13:37:15 +0000
16@@ -70,6 +70,9 @@
17 LT_LIB_M
18 AC_SUBST(LIBM)
19
20+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
21+AC_SUBST(SYSTEMD_USERDIR)
22+
23 ##############################
24 # Custom Junk
25 ##############################
26@@ -152,6 +155,7 @@
27
28 AC_CONFIG_FILES([
29 Makefile
30+data/Makefile
31 libindicator/Makefile
32 libindicator/indicator-0.4.pc.in
33 libindicator/indicator3-0.4.pc.in
34
35=== added directory 'data'
36=== added file 'data/Makefile.am'
37--- data/Makefile.am 1970-01-01 00:00:00 +0000
38+++ data/Makefile.am 2016-09-13 13:37:15 +0000
39@@ -0,0 +1,4 @@
40+systemd_DATA = indicators-pre.target
41+systemddir = $(SYSTEMD_USERDIR)
42+
43+EXTRA_DIST = $(systemd_DATA)
44
45=== added file 'data/indicators-pre.target'
46--- data/indicators-pre.target 1970-01-01 00:00:00 +0000
47+++ data/indicators-pre.target 2016-09-13 13:37:15 +0000
48@@ -0,0 +1,2 @@
49+[Unit]
50+Description=Target representing the lifecycle of the indicators. Each indicator should be bound to it in its individual service file.
51
52=== modified file 'debian/changelog'
53--- debian/changelog 2015-12-08 11:30:05 +0000
54+++ debian/changelog 2016-09-13 13:37:15 +0000
55@@ -1,3 +1,10 @@
56+libindicator (16.10.0-0ubuntu1) UNRELEASED; urgency=medium
57+
58+ * indicator-common: Add a package to hold shared systemd targets
59+ for systemd user session.
60+
61+ -- Ted Gould <ted@ubuntu.com> Mon, 18 Jul 2016 17:53:27 +0200
62+
63 libindicator (12.10.2+16.04.20151208-0ubuntu1) xenial; urgency=medium
64
65 * Add -lm via LDADD to resolve FTBFS in Xenial
66
67=== modified file 'debian/control'
68--- debian/control 2013-06-19 10:42:52 +0000
69+++ debian/control 2016-09-13 13:37:15 +0000
70@@ -86,3 +86,11 @@
71 Tools useful for developers of applications using indicators.
72 .
73 This package contains files that are needed to build applications.
74+
75+Package: indicator-common
76+Section: libs
77+Architecture: all
78+Description: indicator shared files
79+ A package that has files needed to work with the indicators. This
80+ includes the systemd indicators-pre.target.
81+
82
83=== added file 'debian/indicator-common.install'
84--- debian/indicator-common.install 1970-01-01 00:00:00 +0000
85+++ debian/indicator-common.install 2016-09-13 13:37:15 +0000
86@@ -0,0 +1,1 @@
87+usr/lib/systemd
88
89=== modified file 'debian/rules'
90--- debian/rules 2013-06-07 19:45:17 +0000
91+++ debian/rules 2016-09-13 13:37:15 +0000
92@@ -37,12 +37,14 @@
93 find debian/tmp -name \*.la -delete
94 find debian/tmp -name libdummy-indicator\* -delete
95 rm -f debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging
96+ rm -f debian/tmp/gtk2/usr/lib/systemd/user/indicators-pre.target
97 dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk2
98 dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
99 dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk2
100 dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3
101 dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
102 dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3
103+ dh_install -pindicator-common --fail-missing --sourcedir=debian/tmp/gtk3
104
105 override_dh_makeshlibs:
106 dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)'

Subscribers

People subscribed via source and target branches