libindicator

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

  1. systemd-unit
  2. Merge into trunk.16.10
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
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 Approve
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.
Revision history for this message
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
537. By Ted Gould

Fix description to make it easier to understand

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2012-04-04 02:39:27 +0000
+++ Makefile.am 2016-09-13 13:37:15 +0000
@@ -1,6 +1,7 @@
1ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}1ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
22
3SUBDIRS = \3SUBDIRS = \
4 data \
4 libindicator \5 libindicator \
5 tools6 tools
67
78
=== modified file 'configure.ac'
--- configure.ac 2015-12-08 10:08:40 +0000
+++ configure.ac 2016-09-13 13:37:15 +0000
@@ -70,6 +70,9 @@
70LT_LIB_M70LT_LIB_M
71AC_SUBST(LIBM)71AC_SUBST(LIBM)
7272
73SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
74AC_SUBST(SYSTEMD_USERDIR)
75
73##############################76##############################
74# Custom Junk77# Custom Junk
75##############################78##############################
@@ -152,6 +155,7 @@
152155
153AC_CONFIG_FILES([156AC_CONFIG_FILES([
154Makefile157Makefile
158data/Makefile
155libindicator/Makefile159libindicator/Makefile
156libindicator/indicator-0.4.pc.in160libindicator/indicator-0.4.pc.in
157libindicator/indicator3-0.4.pc.in161libindicator/indicator3-0.4.pc.in
158162
=== added directory 'data'
=== added file 'data/Makefile.am'
--- data/Makefile.am 1970-01-01 00:00:00 +0000
+++ data/Makefile.am 2016-09-13 13:37:15 +0000
@@ -0,0 +1,4 @@
1systemd_DATA = indicators-pre.target
2systemddir = $(SYSTEMD_USERDIR)
3
4EXTRA_DIST = $(systemd_DATA)
05
=== added file 'data/indicators-pre.target'
--- data/indicators-pre.target 1970-01-01 00:00:00 +0000
+++ data/indicators-pre.target 2016-09-13 13:37:15 +0000
@@ -0,0 +1,2 @@
1[Unit]
2Description=Target representing the lifecycle of the indicators. Each indicator should be bound to it in its individual service file.
03
=== modified file 'debian/changelog'
--- debian/changelog 2015-12-08 11:30:05 +0000
+++ debian/changelog 2016-09-13 13:37:15 +0000
@@ -1,3 +1,10 @@
1libindicator (16.10.0-0ubuntu1) UNRELEASED; urgency=medium
2
3 * indicator-common: Add a package to hold shared systemd targets
4 for systemd user session.
5
6 -- Ted Gould <ted@ubuntu.com> Mon, 18 Jul 2016 17:53:27 +0200
7
1libindicator (12.10.2+16.04.20151208-0ubuntu1) xenial; urgency=medium8libindicator (12.10.2+16.04.20151208-0ubuntu1) xenial; urgency=medium
29
3 * Add -lm via LDADD to resolve FTBFS in Xenial10 * Add -lm via LDADD to resolve FTBFS in Xenial
411
=== modified file 'debian/control'
--- debian/control 2013-06-19 10:42:52 +0000
+++ debian/control 2016-09-13 13:37:15 +0000
@@ -86,3 +86,11 @@
86 Tools useful for developers of applications using indicators.86 Tools useful for developers of applications using indicators.
87 .87 .
88 This package contains files that are needed to build applications.88 This package contains files that are needed to build applications.
89
90Package: indicator-common
91Section: libs
92Architecture: all
93Description: indicator shared files
94 A package that has files needed to work with the indicators. This
95 includes the systemd indicators-pre.target.
96
8997
=== added file 'debian/indicator-common.install'
--- debian/indicator-common.install 1970-01-01 00:00:00 +0000
+++ debian/indicator-common.install 2016-09-13 13:37:15 +0000
@@ -0,0 +1,1 @@
1usr/lib/systemd
02
=== modified file 'debian/rules'
--- debian/rules 2013-06-07 19:45:17 +0000
+++ debian/rules 2016-09-13 13:37:15 +0000
@@ -37,12 +37,14 @@
37 find debian/tmp -name \*.la -delete37 find debian/tmp -name \*.la -delete
38 find debian/tmp -name libdummy-indicator\* -delete38 find debian/tmp -name libdummy-indicator\* -delete
39 rm -f debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging39 rm -f debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging
40 rm -f debian/tmp/gtk2/usr/lib/systemd/user/indicators-pre.target
40 dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk241 dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk2
41 dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk242 dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
42 dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk243 dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk2
43 dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk344 dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3
44 dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk345 dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
45 dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk346 dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3
47 dh_install -pindicator-common --fail-missing --sourcedir=debian/tmp/gtk3
4648
47override_dh_makeshlibs:49override_dh_makeshlibs:
48 dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)'50 dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)'

Subscribers

People subscribed via source and target branches