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

[Ted Gould]

Adding a systemd user unit

We're gonna have a systemd user session!

[lp:~ted/indicator-application/systemd-unit]

256. By Ted Gould on 2016-07-18

Adding an after clause to ensure they start before us

257. By Ted Gould on 2016-07-18

Restructuring our dependencies

258. By Ted Gould on 2016-07-19

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

259. By Ted Gould on 2016-07-20

Adding a restart rule

[Martin Pitt (pitti)]

LGTM, and works well, thank you!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2014-02-20 03:27:31 +0000
+++ configure.ac	2016-07-20 06:58:58 +0000
@@ -48,6 +48,9 @@
                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
 
+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
+AC_SUBST(SYSTEMD_USERDIR)
+
 ###########################
 # gcov coverage reporting
 ###########################
@@ -111,4 +114,5 @@
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
 	gcov:          $use_gcov
+	systemd unit:  $SYSTEMD_USERDIR
 ])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-02-20 20:48:59 +0000
+++ data/Makefile.am	2016-07-20 06:58:58 +0000
@@ -16,12 +16,24 @@
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
 
+%.service: %.service.in
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+systemddir = $(SYSTEMD_USERDIR)
+systemd_DATA = indicator-application.service
+
+upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
+upstartsystemdoverride_DATA = indicator-application.override
+
 EXTRA_DIST = \
 	indicator-application.desktop.in \
 	indicator-application.conf.in \
+	indicator-application.service.in \
+	indicator-application.override \
 	ordering-override.keyfile
 
 CLEANFILES = \
 	indicator-application.conf \
-	indicator-application.desktop
+	indicator-application.desktop \
+	indicator-application.service
 

=== added file 'data/indicator-application.override'
--- data/indicator-application.override	1970-01-01 00:00:00 +0000
+++ data/indicator-application.override	2016-07-20 06:58:58 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'data/indicator-application.service.in'
--- data/indicator-application.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-application.service.in	2016-07-20 06:58:58 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Indicator Application Service
+PartOf=graphical-session.target
+After=indicators-pre.target
+
+[Service]
+ExecStart=@pkglibexecdir@/indicator-application-service
+Restart=on-failure

=== modified file 'debian/control'
--- debian/control	2014-03-21 16:21:44 +0000
+++ debian/control	2016-07-20 06:58:58 +0000
@@ -17,6 +17,7 @@
                libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
+               systemd,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-application
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -29,6 +30,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
+         indicator-common,
 Description: Application Indicators
  An indicator to take menus from applications and place them in the panel.