[pkg-remote-commits] [xrdp] 03/03: 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 c8083db15b419b0bccd08464bd89c6c06d2fcca4
Merge: 7273a28 d497f4b
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Feb 16 16:50:56 2018 +0100

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

 debian/changelog | 6 ++++++
 debian/control   | 3 +--
 debian/rules     | 7 -------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 86c8a91,7be015c..3339562
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,19 @@@
 -xrdp (0.9.5-2) UNRELEASED; urgency=medium
 +xrdp (0.9.5-2) unstable; urgency=medium
 +
++  [ Thorsten Glaser ]
+ 
+   * Re-enable asm code for i386, the fixed upstream is included now.
+ 
 - -- Thorsten Glaser <tg at mirbsd.de>  Sat, 13 Jan 2018 16:03:39 +0000
++  [ Dominik George ]
++
 +  * Enable vsock.
 +    + Requested by Craig White and Justin Terry from Microsoft.
 +  * Fix lintian issues.
 +    + Use HTTPS copyright format URL.
 +    + Move source{.,/}lintian-overrides.
 +    + Replace dh_systemd_start with dh_installsystemd call.
 +
 + -- Dominik George <nik at naturalnet.de>  Fri, 16 Feb 2018 16:42:50 +0100
  
  xrdp (0.9.5-1) unstable; urgency=medium
  

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