[pkg-remote-commits] [xrdp] 01/01: Merge branch 'master' into jessie-backports

[Dominik George]

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

natureshadow-guest pushed a commit to branch jessie-backports
in repository xrdp.

commit 2abf7efb22d9b5d5025c8bdf5525a8e205b2615a
Merge: dc3fbdc e5a862f
Author: Dominik George <nik at naturalnet.de>
Date:   Mon Feb 6 21:58:08 2017 +0100

    Merge branch 'master' into jessie-backports

 debian/README.Debian         |   4 +-
 debian/changelog             |  34 +++++++++++--
 debian/compat                |   2 +-
 debian/control               |  10 ++--
 debian/copyright             |   3 +-
 debian/patches/kfreebsd.diff |  63 ++++++++++++++++++++++++
 debian/patches/lfs.diff      |  74 ++++++++++++++++++++++++++++
 debian/patches/nxstack.diff  | 114 -------------------------------------------
 debian/patches/series        |   5 +-
 debian/patches/sockpath.diff |  16 +++++-
 debian/patches/systemd.diff  |  38 ++++++---------
 debian/rules                 |  47 +++++++++++++++---
 debian/xrdp.bug-control      |   2 +-
 debian/xrdp.preinst          |  38 +++++++++++++++
 14 files changed, 291 insertions(+), 159 deletions(-)

diff --cc debian/changelog
index b340e5a,1ddbfb1..3a66969
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,30 +1,36 @@@
- xrdp (0.9.1-2~bpo8+1) jessie-backports; urgency=medium
++xrdp (0.9.1-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Dominik George <nik at naturalnet.de>  Sun, 01 Jan 2017 17:41:48 +0100
++ -- Dominik George <nik at naturalnet.de>  Mon, 06 Feb 2017 21:58:02 +0100
++
+ xrdp (0.9.1-4) unstable; urgency=high
+ 
+   [ Thorsten Glaser ]
+   * Fix up PAM conffile handling for upgrades from jessie{,-backports}.
+   * Fix build on non-linux architectures. (Closes: #831663)
+     + Don’t use FUSE on the Hurd, it does not support enough of it yet.
+     + Add GNU/kFreeBSD support to NASM format detection autoconfigury.
+   * Remove patch to make stack not executable in *.asm files; upstrem
+     fixed this already.
+   * Enable Large File Support, as pointed out by lintian.
+   * Disable assembly code on any-i386 for now, it must be ported
+     (partially rewritten) for PIC support.
+ 
+   [ Dominik George ]
+   * Update/minimise systemd service file patch.
+     + Also moves sockpath related part to sockpath patch.
+   * Switch back to compat level 10.
+ 
+  -- Dominik George <nik at naturalnet.de>  Wed, 25 Jan 2017 18:10:11 +0100
+ 
+ xrdp (0.9.1-3) unstable; urgency=medium
+ 
+   * Fix up last changelog entry.
+   * Update bug-control.
+     + Report status of xserver-xorg-legacy.
+ 
+  -- Dominik George <nik at naturalnet.de>  Sun, 15 Jan 2017 00:30:44 +0100
  
  xrdp (0.9.1-2) unstable; urgency=medium
  

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