From a0993948b82c63a0c2687fde303c5993545bb693 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@ubuntu.com>
Date: Mon, 15 May 2017 12:20:44 +0200
Subject: Adding a systemd user unit.

---
 configure.ac                                  |  4 ++++
 data/Makefile.am                              | 15 +++++++++++++--
 data/ayatana-indicator-application.override   |  1 +
 data/ayatana-indicator-application.service.in |  8 ++++++++
 debian/control                                |  2 ++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 data/ayatana-indicator-application.override
 create mode 100644 data/ayatana-indicator-application.service.in

diff --git a/configure.ac b/configure.ac
index 167f1d6..c2a4272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,9 @@ PKG_CHECK_MODULES(INDICATOR,  glib-2.0 >= $GLIB_REQUIRED_VERSION
                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
 
+SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
+AC_SUBST(SYSTEMD_USERDIR)
+
 ###########################
 # gcov coverage reporting
 ###########################
@@ -113,4 +116,5 @@ Application Indicator Configuration:
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
 	gcov:          $use_gcov
+	systemd unit:  $SYSTEMD_USERDIR
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index bc5260d..3851097 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,12 +16,23 @@ xdg_autostart_DATA = ayatana-indicator-application.desktop
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
 
+%.service: %.service.in
+        $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+ 
+systemddir = $(SYSTEMD_USERDIR)
+systemd_DATA = ayatana-indicator-application.service
+
+upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
+upstartsystemdoverride_DATA = ayatana-indicator-application.override
+
 EXTRA_DIST = \
 	ayatana-indicator-application.desktop.in \
 	ayatana-indicator-application.conf.in \
+	ayatana-indicator-application.service.in \
+	ayatana-indicator-application.override \
 	ordering-override.keyfile
 
 CLEANFILES = \
 	ayatana-indicator-application.conf \
-	ayatana-indicator-application.desktop
-
+	ayatana-indicator-application.desktop \
+	ayatana-indicator-application.service
diff --git a/data/ayatana-indicator-application.override b/data/ayatana-indicator-application.override
new file mode 100644
index 0000000..2905494
--- /dev/null
+++ b/data/ayatana-indicator-application.override
@@ -0,0 +1 @@
+manual
diff --git a/data/ayatana-indicator-application.service.in b/data/ayatana-indicator-application.service.in
new file mode 100644
index 0000000..b1068d0
--- /dev/null
+++ b/data/ayatana-indicator-application.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ayatana Indicator Application Service
+PartOf=graphical-session.target
+After=ayatana-indicators-pre.target
+
+[Service]
+ExecStart=@pkglibexecdir@/ayatana-indicator-application-service
+Restart=on-failure
diff --git a/debian/control b/debian/control
index 36ae417..ae7504c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9.0),
                libayatana-indicator3-dev (>= 0.6.0~),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
+               systemd,
 Standards-Version: 3.9.6
 Homepage: https://github.com/ArcticaProject/ayatana-indicator-application
 Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-application.git
@@ -25,5 +26,6 @@ Package: ayatana-indicator-application
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
+         ayatana-indicator-common,
 Description: Ayatana Application Indicators
  An indicator to take menus from applications and place them in the panel.
-- 
cgit v1.2.3