[pkg-remote-commits] [xrdp] 03/04: Minimise systemd service file patch.

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 3ec9fcd5052a200a635138afd9b91f1388b7849c
Author: Dominik George <nik at naturalnet.de>
Date:   Wed Jan 25 15:26:13 2017 +0100

    Minimise systemd service file patch.
---
 debian/changelog            |  5 ++++-
 debian/patches/series       |  2 +-
 debian/patches/systemd.diff | 29 ++++++++++++++---------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8179968..75e3cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ xrdp (0.9.1-4) unstable; urgency=high
   * Remove patch to make stack not executable in *.asm files; upstrem
     fixed this already.
 
- -- Dominik George <nik at naturalnet.de>  Wed, 25 Jan 2017 15:17:52 +0100
+  [ Dominik George ]
+  * Update/minimise systemd service file patch.
+
+ -- Dominik George <nik at naturalnet.de>  Wed, 25 Jan 2017 15:39:19 +0100
 
 xrdp (0.9.1-3) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 56090f4..cd218cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
 make-fixes.diff
 config.diff
 misc-fixes.diff
-systemd.diff
 fix_perms.diff
 shutup-daemon.diff
 sockpath.diff
 kfreebsd.diff
+systemd.diff
diff --git a/debian/patches/systemd.diff b/debian/patches/systemd.diff
index 00ad54c..ec75c02 100644
--- a/debian/patches/systemd.diff
+++ b/debian/patches/systemd.diff
@@ -1,17 +1,17 @@
-From: Dominik George <nik at naturalnet.de
-Subject: systemd service files for Debian
+Subject: Fixes to systemd service files
+From: Dominik George <nik at naturalnet.de>
+Forwarded: https://github.com/neutrinolabs/xrdp/pull/646
 --- a/instfiles/xrdp-sesman.service
 +++ b/instfiles/xrdp-sesman.service
-@@ -1,12 +1,12 @@
+@@ -1,12 +1,13 @@
  [Unit]
--Description=xrdp session manager
+ Description=xrdp session manager
 -After=syslog.target network.target
--StopWhenUnneeded=true
--BindTo=xrdp.service
-+Description=xrdp (X Remote Desktop Protocol) session manager
 +Documentation=man:xrdp-sesman(8)  man:sesman.ini(5)
-+Requires=xrdp.service
-+After=network.target xrdp.service
++After=network.target
+ StopWhenUnneeded=true
+-BindTo=xrdp.service
++BindsTo=xrdp.service
  
  [Service]
  Type=forking
@@ -22,14 +22,13 @@ Subject: systemd service files for Debian
  ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
 --- a/instfiles/xrdp.service
 +++ b/instfiles/xrdp.service
-@@ -1,15 +1,20 @@
+@@ -1,15 +1,21 @@
  [Unit]
--Description=xrdp daemon
--Requires=xrdp-sesman.service
--After=syslog.target network.target xrdp-sesman.service
-+Description=xrdp (X Remote Desktop Protocol) protocol server
+ Description=xrdp daemon
 +Documentation=man:xrdp(8) man:xrdp.ini(5)
-+After=network.target
+ Requires=xrdp-sesman.service
+-After=syslog.target network.target xrdp-sesman.service
++After=network.target xrdp-sesman.service
  
  [Service]
  Type=forking

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