[pkg-remote-commits] [xrdp] 06/06: Merge branch 'master' of git.debian.org:/git/pkg-remote/xrdp

[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 bec5a9f525dc1e1a6af496addafa1f5ce160a74b
Merge: 2683471 d8465bd
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Jan 7 17:08:54 2018 +0100

    Merge branch 'master' of git.debian.org:/git/pkg-remote/xrdp

 debian/README.Debian              |  2 +-
 debian/changelog                  | 23 ++++++++++++++++++++---
 debian/control                    |  3 ++-
 debian/copyright                  |  2 +-
 debian/patches/pulse-debian.patch |  2 +-
 debian/rules                      |  7 +++++++
 debian/startwm.sh                 |  6 +++++-
 debian/xrdp-build-pulse-modules.8 |  2 +-
 8 files changed, 38 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index a8861b1,643ff66..d4f9ccc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,19 +1,30 @@@
 +xrdp (0.9.5-1) unstable; urgency=medium
 +
 +  * New upstream version.
 +    + Remove patches applied upstream.
 +    + Refresh other patches.
 +    + Update debian/copyright.
 +  * Call X.org directly and remove notes about the wrapper.
 +  * Bump Standards-Version to 4.1.3, no changes needed.
 +
 + -- Dominik George <nik at naturalnet.de>  Sun, 07 Jan 2018 16:25:19 +0100
 +
+ xrdp (0.9.4-5) unstable; urgency=medium
+ 
+   [ Dominik George ]
+   * Add package to build PulseAudio modules.
+     + Thanks to Wolfgang Schweer for the initial idea!
+   * Update README.Debian.
+ 
+   [ Thorsten Glaser ]
+   * Fix typos.
+   * Upload separately from the previous version targetting NEW.
+ 
+  -- Thorsten Glaser <tg at mirbsd.de>  Fri, 22 Dec 2017 17:09:14 +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)

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