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

[Martin Pitt]

Add systemd unit

Last indicator that needs porting!

[Martin Pitt (pitti)]

Works fine, aside from unity-panel-service needing to actually pull it in (will put up a unity MP for that). LGTM, thanks Ted!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2014-02-20 16:06:20 +0000
+++ configure.ac	2016-10-26 14:48:15 +0000
@@ -52,9 +52,13 @@
     AC_MSG_ERROR([could not find cups-config])
 fi
 AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([could not find cups.h]))
-SERVICE_CFLAGS+=`$CUPS_CONFIG --cflags`
-SERVICE_LIBS+=`$CUPS_CONFIG --libs`
+CUPS_CFLAGS+=`$CUPS_CONFIG --cflags`
+CUPS_LIBS+=`$CUPS_CONFIG --libs`
+SERVICE_CFLAGS="$SERVICE_CFLAGS $CUPS_CFLAGS"
+SERVICE_LIBS="$SERVICE_LIBS $CUPS_LIBS"
 
+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
+AC_SUBST(SYSTEMD_USERDIR)
 
 with_localinstall="no"
 AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall],

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-02-20 16:08:19 +0000
+++ data/Makefile.am	2016-10-26 14:48:15 +0000
@@ -6,6 +6,27 @@
 SUBDIRS = upstart
 
 #
+# the systemd unit file
+#
+
+systemddir = $(SYSTEMD_USERDIR)
+systemd_DATA = indicator-printers.service
+systemd_in = $(systemd_DATA:.service=.service.in)
+$(systemd_DATA): $(systemd_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(systemd_DATA)
+EXTRA_DIST += $(systemd_in)
+CLEANFILES += $(systemd_DATA)
+
+#
+# the systemd upstart override
+#
+
+upstart_overridedir = $(datadir)/upstart/systemd-session/upstart
+upstart_override_DATA = indicator-printers.override
+EXTRA_DIST += $(upstart_override_DATA)
+
+#
 # the upstart job file
 #
 

=== added file 'data/indicator-printers.override'
--- data/indicator-printers.override	1970-01-01 00:00:00 +0000
+++ data/indicator-printers.override	2016-10-26 14:48:15 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'data/indicator-printers.service.in'
--- data/indicator-printers.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-printers.service.in	2016-10-26 14:48:15 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Indicator Printers Service
+PartOf=graphical-session.target
+After=indicators-pre.target
+
+[Service]
+ExecStart=@pkglibexecdir@/indicator-printers-service
+Restart=on-failure

=== modified file 'debian/control'
--- debian/control	2015-02-06 16:33:33 +0000
+++ debian/control	2016-10-26 14:48:15 +0000
@@ -14,6 +14,7 @@
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libindicator3-dev (>= 0.3.91),
                libcups2-dev,
+               systemd,
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/indicator-printers
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -27,6 +28,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          cups (>= 1.5),
+         indicator-common,
 Recommends: indicator-applet (>= 0.2) | indicator-renderer,
             system-config-printer-gnome,
 Description: indicator showing active print jobs