[pkg-remote-commits] [xrdp] 13/19: Merge branch 'sid' into master

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit 925c61160ffa1316eaaa5108bf3fc46db03917c5
Merge: bd1f354 3b37e34
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Fri Dec 22 16:53:37 2017 +0100

    Merge branch 'sid' into master

 debian/README.Debian    |  2 +-
 debian/changelog        | 17 ++++++++++++++---
 debian/copyright        |  2 +-
 debian/startwm.sh       |  6 +++++-
 debian/xrdp.bug-presubj |  4 ++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 4558a13,b94d586..e6ad6c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,14 @@@
++xrdp (0.9.4-5) unstable; urgency=medium
++
++  * Add package to build PulseAudio modules.
++    + Thanks to Wolfgang Schweer for the initial idea!
++  * Update README.Debian.
++
++ -- Dominik George <nik at naturalnet.de>  Thu, 21 Dec 2017 19:33:54 +0100
++
  xrdp (0.9.4-4) unstable; urgency=high
  
+   [ Dominik George ]
    * Fix (possibly exploitable) high CPU load in ssl_tls_accept.
      (Closes: #884453)
    * Source /etc/profile in startwm. (Closes: #882246)
diff --cc debian/startwm.sh
index 9341fae,9ab3f5d..4fde7aa
--- a/debian/startwm.sh
+++ b/debian/startwm.sh
@@@ -1,11 -1,7 +1,11 @@@
  #!/bin/sh
- # xrdp X session start script (c) 2015 mirabilos
+ # xrdp X session start script (c) 2015, 2017 mirabilos
  # published under The MirOS Licence
  
 +if test -r /etc/profile; then
 +	. /etc/profile
 +fi
 +
  if test -r /etc/default/locale; then
  	. /etc/default/locale
  	test -z "${LANG+x}" || export LANG

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