[Pkg-telepathy-commits] [telepathy-gabble] 01/04: d/p/Add-a-systemd-user-service.patch: Add a systemd user service file

[Laurent Bigonville]

This is an automated email from the git hooks/post-receive script.

bigon pushed a commit to branch debian
in repository telepathy-gabble.

commit c4e28b745b81027b9afb6f384c39173b975689b6
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Dec 9 16:54:37 2015 +0100

    d/p/Add-a-systemd-user-service.patch: Add a systemd user service file
---
 debian/changelog                                |  6 +-
 debian/patches/Add-a-systemd-user-service.patch | 75 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/telepathy-gabble.install                 |  1 +
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b5dc633..7d67b91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 telepathy-gabble (0.18.3-2) UNRELEASED; urgency=medium
 
+  [ Simon McVittie ]
   * Remove myself from Uploaders
 
- -- Simon McVittie <smcv at debian.org>  Fri, 12 Dec 2014 13:38:24 +0000
+  [ Laurent Bigonville ]
+  * d/p/Add-a-systemd-user-service.patch: Add a systemd user service file
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 09 Dec 2015 16:52:37 +0100
 
 telepathy-gabble (0.18.3-1) unstable; urgency=medium
 
diff --git a/debian/patches/Add-a-systemd-user-service.patch b/debian/patches/Add-a-systemd-user-service.patch
new file mode 100644
index 0000000..7a3bceb
--- /dev/null
+++ b/debian/patches/Add-a-systemd-user-service.patch
@@ -0,0 +1,75 @@
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Thu, 24 Sep 2015 12:51:48 +0100
+Subject: Add a systemd user service
+
+This puts telepathy-gabble in its own cgroup, instead of being a
+child process of dbus-daemon in the dbus.service cgroup.
+---
+ data/Makefile.am                 | 17 +++++++++++++++--
+ data/gabble.service.in           |  1 +
+ data/telepathy-gabble.systemd.in |  7 +++++++
+ 3 files changed, 23 insertions(+), 2 deletions(-)
+ create mode 100644 data/telepathy-gabble.systemd.in
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index cf48bc1..7c611dc 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -1,4 +1,7 @@
+-EXTRA_DIST = gabble.service.in
++EXTRA_DIST = \
++	gabble.service.in \
++	telepathy-gabble.systemd.in \
++	$(NULL)
+ 
+ managerdir = $(datadir)/telepathy/managers
+ manager_DATA = gabble.manager
+@@ -6,6 +9,9 @@ manager_DATA = gabble.manager
+ servicedir = $(datadir)/dbus-1/services
+ service_DATA = org.freedesktop.Telepathy.ConnectionManager.gabble.service
+ 
++systemd_userdir = $(prefix)/lib/systemd/user
++systemd_user_DATA = telepathy-gabble.service
++
+ # We don't use the full filename for the .in because > 99 character filenames
+ # in tarballs are non-portable (and automake 1.8 doesn't let us build
+ # non-archaic tarballs)
+@@ -13,7 +19,14 @@ org.freedesktop.Telepathy.ConnectionManager.gabble.service: gabble.service.in \
+ 		Makefile
+ 	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+ 
+-CLEANFILES = $(service_DATA) $(manager_DATA)
++telepathy-gabble.service: telepathy-gabble.systemd.in Makefile
++	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
++
++CLEANFILES = \
++	$(manager_DATA) \
++	$(service_DATA) \
++	$(systemd_user_DATA) \
++	$(NULL)
+ 
+ $(manager_DATA): ../src/write-mgr-file.c ../src/protocol.c ../src/protocol.h
+ 	@$(MAKE) -C ../src write-mgr-file$(EXEEXT)
+diff --git a/data/gabble.service.in b/data/gabble.service.in
+index 925e7a8..9719489 100644
+--- a/data/gabble.service.in
++++ b/data/gabble.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.freedesktop.Telepathy.ConnectionManager.gabble
+ Exec=@libexecdir@/telepathy-gabble
++SystemdService=telepathy-gabble.service
+diff --git a/data/telepathy-gabble.systemd.in b/data/telepathy-gabble.systemd.in
+new file mode 100644
+index 0000000..c5d0356
+--- /dev/null
++++ b/data/telepathy-gabble.systemd.in
+@@ -0,0 +1,8 @@
++[Unit]
++Description=Telepathy XMPP service
++Documentation=man:telepathy-gabble(8)
++
++[Service]
++Type=dbus
++BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
++ExecStart=@libexecdir@/telepathy-gabble
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..4f2b599 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Add-a-systemd-user-service.patch
diff --git a/debian/telepathy-gabble.install b/debian/telepathy-gabble.install
index a299646..2e486b5 100644
--- a/debian/telepathy-gabble.install
+++ b/debian/telepathy-gabble.install
@@ -1,3 +1,4 @@
+debian/tmp/usr/lib/systemd/user/
 debian/tmp/usr/lib/telepathy/telepathy-gabble
 debian/tmp/usr/lib/telepathy/gabble-0/lib/libgabble-plugins-*.so
 debian/tmp/usr/lib/telepathy/gabble-0/lib/libwocky-*.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble.git