[pkg-remote-commits] [xrdp] 05/05: Mark branch 'experimental' as merged (actually, cherry-picked).

[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 25ecee00b47728a160768157e693c7b434f63fd0
Merge: 8d27ccf 3e04175
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Tue Oct 10 20:21:26 2017 +0200

    Mark branch 'experimental' as merged (actually, cherry-picked).

 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index d1c547e,3c9bae3..086cdf8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,16 +1,42 @@@
 -xrdp (0.9.2~20170325-1~exp1) experimental; urgency=low
 +xrdp (0.9.4-2) UNRELEASED; urgency=medium
  
 -  * Upload to experimental.
 -  * Merge uploads from unstable.
 -  * Run libpainter/bootstrap as well.
 -  * Update debian/copyright file for the new upstream snapshot
 -    (only new files with notices, changed notices, big deletions;
 -    the file delta from using a snapshot is ignored: 0.9.2 won’t have them).
 -  * Refresh patches; drop patches applied upstream.
 -  * Add assembly patches for relocation-safe data access.
 +  [ Dominik George ]
 +  * Fix typo in previous changelog.
 +
 +  [ Thorsten Glaser ]
    * Place missing log_end_msg in init script.
 +  * Run libpainter/bootstrap as well.
 +  * Re-enable SIMD on any-i386.
++  * Cherry-pick missing parts from experimental branch.
 +
-  -- Dominik George <nik at naturalnet.de>  Mon, 09 Oct 2017 19:39:13 +0200
++ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 10 Oct 2017 20:21:09 +0200
 +
 +xrdp (0.9.4-1) unstable; urgency=medium
 +
 +  * New upstream version. (Closes: #876976, #858098, #864230, #867494)
 +    + Includes xorgxrdp 0.2.4.
 +    + Refreshed patches.
 +    + Updated d/copyright.
 +    + Japanese keybaord patch is not needed anymore, applied upstream.
 +    + High resolution RFX patch is not needed anymore, applied upstream.
 +    + FreeBSD patch is not needed anymore, applied upstream.
 +    + Socket path patch is not needed anymore, made configurable upstream.
 +    + CVE-2017-6967 patch is not needed anymore, applied upstream.
 +  * Update to policy version 4.1.1 (no changes needed).
 +
 + -- Dominik George <nik at naturalnet.de>  Mon, 09 Oct 2017 19:00:08 +0200
 +
 +xrdp (0.9.1-9) unstable; urgency=high
  
 - -- Thorsten Glaser <tg at mirbsd.de>  Sat, 25 Mar 2017 22:43:55 +0100
 +  * Revisit incomplete fix for CVE-2017-6967. (Closes: #858143)
 +
 + -- Dominik George <nik at naturalnet.de>  Thu, 04 May 2017 18:59:10 +0200
 +
 +xrdp (0.9.1-8) unstable; urgency=medium
 +
 +  * Fix CVE-2017-6967. (Closes: #858143, #855536)
 +
 + -- Dominik George <nik at naturalnet.de>  Mon, 24 Apr 2017 20:14:36 +0200
  
  xrdp (0.9.1-7) unstable; urgency=medium
  

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