[debian-edu-commits] debian-edu/pkg-team/ 107/159: …gah!

[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 d85e4f2bbb1f305e3306bf7451fc56e533bcdd0d
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 26 23:14:47 2015 +0200

    …gah!
---
 changelog            | 6 ++++++
 patches/systemd.diff | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 48e1c88..8d37ed8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~git20150826-1~alpha2) teckids; urgency=medium
+
+  * Fix “service xrdp start” to not hang forever as we foreground xrdp
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 26 Aug 2015 23:14:01 +0200
+
 xrdp (0.9.0~git20150826-1~alpha1) teckids; urgency=medium
 
   [ Dominik George ]
diff --git a/patches/systemd.diff b/patches/systemd.diff
index 7120afe..e9e6574 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -32,9 +32,10 @@
 +After=network.target xrdp-sesman.service
  
  [Service]
- Type=forking
+-Type=forking
 -PIDFile=/var/run/xrdp.pid
 -EnvironmentFile=/etc/sysconfig/xrdp
++Type=simple
 +PIDFile=/var/run/xrdp/xrdp.pid
 +EnvironmentFile=/etc/default/xrdp
 +RuntimeDirectory=/run/xrdp

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