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

[Ted Gould]

Adding a systemd user session unit file

Last indicator in the first half of the alphabet!

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

449. By Ted Gould on 2016-07-20

Adding a restart rule

[Martin Pitt (pitti)]

LGTM and works fine, thanks!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2015-03-06 15:44:27 +0000
+++ configure.ac	2016-07-20 06:58:47 +0000
@@ -65,6 +65,9 @@
 	    [with_indicator_dir=$datadir/unity/indicators])
 AC_SUBST([INDICATOR_DIR], [$with_indicator_dir])
 
+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
+AC_SUBST(SYSTEMD_USERDIR)
+
 ###########################
 # gcov coverage reporting
 ###########################

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-02-20 05:12:07 +0000
+++ data/Makefile.am	2016-07-20 06:58:47 +0000
@@ -12,6 +12,15 @@
 %.conf: %.conf.in
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
+%.service: %.service.in
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+systemddir = $(SYSTEMD_USERDIR)
+systemd_DATA = indicator-messages.service
+
+upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
+upstartsystemdoverride_DATA = indicator-messages.override
+
 gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
 
@@ -21,8 +30,11 @@
 EXTRA_DIST = \
 	indicator-messages.desktop.in \
 	indicator-messages.conf.in \
+	indicator-messages.override \
+	indicator-messages.service.in \
 	$(gsettings_SCHEMAS)
 
 CLEANFILES = \
+	indicator-messages.service \
 	$(xdg_autostart_DATA) \
 	$(upstart_jobs_DATA)

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

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

=== modified file 'debian/control'
--- debian/control	2015-03-06 15:44:27 +0000
+++ debian/control	2016-07-20 06:58:47 +0000
@@ -16,6 +16,7 @@
                libgtest-dev,
                python3-dbusmock,
                valac,
+               systemd,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-messages
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -26,7 +27,9 @@
 
 Package: indicator-messages
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-common
 Recommends: indicator-applet | indicator-renderer
 Replaces: libindicator-messages-status-provider1,
           libindicator-messages-status-provider-dev,

=== modified file 'debian/indicator-messages.install'
--- debian/indicator-messages.install	2014-02-20 05:12:46 +0000
+++ debian/indicator-messages.install	2016-07-20 06:58:47 +0000
@@ -4,3 +4,4 @@
 usr/share/icons
 usr/share/unity/indicators
 etc/xdg/autostart
+usr/lib/systemd