[debian-edu-commits] debian-edu/pkg-team/ 78/159: let upstream install the systemd service files patched for use with Debian

[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 1273a011bc6a3be9bfb00211d017a89cb930c6bf
Author: Natureshadow <dominik.george at teckids.org>
Date:   Wed Aug 26 19:42:48 2015 +0200

    let upstream install the systemd service files patched for use with Debian
---
 patches/series       |  1 +
 patches/systemd.diff | 41 +++++++++++++++++++++++++++++++++++++++++
 xrdp-sesman.service  | 16 ----------------
 xrdp.service         | 15 ---------------
 4 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/patches/series b/patches/series
index 4f4a587..e29585c 100644
--- a/patches/series
+++ b/patches/series
@@ -4,3 +4,4 @@ config.diff
 keymap-default.diff
 keymap-fallback.diff
 misc-fixes.diff
+systemd.diff
diff --git a/patches/systemd.diff b/patches/systemd.diff
new file mode 100644
index 0000000..6dbed82
--- /dev/null
+++ b/patches/systemd.diff
@@ -0,0 +1,41 @@
+# DP: systemd service files for Debian
+
+--- a/instfiles/xrdp-sesman.service
++++ b/instfiles/xrdp-sesman.service
+@@ -1,13 +1,14 @@
+ [Unit]
+-Description=xrdp session manager
++Description=Remote Desktop Protocol (RDP) server - Session Manager
+ After=syslog.target network.target
+ StopWhenUnneeded=true
+ BindTo=xrdp.service
+ 
+ [Service]
+ Type=forking
+-PIDFile=/var/run/xrdp-sesman.pid
+-EnvironmentFile=/etc/sysconfig/xrdp
++PIDFile=/var/run/xrdp/xrdp-sesman.pid
++EnvironmentFile=/etc/default/xrdp
++RuntimeDirectory=/run/xrdp
+ ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
+ ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
+ 
+--- a/instfiles/xrdp.service
++++ b/instfiles/xrdp.service
+@@ -1,12 +1,13 @@
+ [Unit]
+-Description=xrdp daemon
++Description=Remote Desktop Protocol (RDP) server
+ Requires=xrdp-sesman.service
+ After=syslog.target network.target xrdp-sesman.service
+ 
+ [Service]
+ Type=forking
+-PIDFile=/var/run/xrdp.pid
+-EnvironmentFile=/etc/sysconfig/xrdp
++PIDFile=/var/run/xrdp/xrdp.pid
++EnvironmentFile=/etc/default/xrdp
++RuntimeDirectory=/run/xrdp
+ ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
+ ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
+ 
diff --git a/xrdp-sesman.service b/xrdp-sesman.service
deleted file mode 100644
index 788dbbe..0000000
--- a/xrdp-sesman.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Remote Desktop Protocol (RDP) server - Session Manager
-After=syslog.target network.target
-StopWhenUnneeded=true
-BindTo=xrdp.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp/xrdp-sesman.pid
-EnvironmentFile=/etc/default/xrdp
-RuntimeDirectory=/run/xrdp
-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
-
-[Install]
-WantedBy=multi-user.target
diff --git a/xrdp.service b/xrdp.service
deleted file mode 100644
index 47eb8a5..0000000
--- a/xrdp.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Remote Desktop Protocol (RDP) server
-Requires=xrdp-sesman.service
-After=syslog.target network.target xrdp-sesman.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp/xrdp.pid
-EnvironmentFile=/etc/default/xrdp
-RuntimeDirectory=/run/xrdp
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
-
-[Install]
-WantedBy=multi-user.target

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