[Pkg-remote-commits] [xrdp] 01/01: Fix config patch.

[Dominik George]

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

natureshadow-guest pushed a commit to annotated tag debian/0.9.1_20161126+git589b29f-2
in repository xrdp.

commit e1db903810f290b19903f344c64e4d29ac9b07e2
Author: Dominik George <nik at naturalnet.de>
Date:   Tue Nov 29 13:00:41 2016 +0100

    Fix config patch.
---
 debian/changelog           |  5 +++--
 debian/patches/config.diff | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38f5b16..f1cdea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xrdp (0.9.1~20161126+git589b29f-2) UNRELEASED; urgency=medium
+xrdp (0.9.1~20161126+git589b29f-2) unstable; urgency=medium
 
   * Remove X log redirection to /dev/null. (Closes: #846160)
+  * Fix up config patch broken in previous upload. (Closes: #846055)
 
- -- Dominik George <nik at naturalnet.de>  Mon, 28 Nov 2016 20:52:06 +0100
+ -- Dominik George <nik at naturalnet.de>  Tue, 29 Nov 2016 12:59:21 +0100
 
 xrdp (0.9.1~20161126+git589b29f-1) unstable; urgency=medium
 
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 11f53da..2bf23bf 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -4,16 +4,42 @@ Subject: config patches for Debian
  Use xorgxrdp instead of x11rdp
 --- a/sesman/sesman.ini
 +++ b/sesman/sesman.ini
-@@ -84,8 +84,7 @@ param=xrdp/xorg.conf
- param=-noreset
+@@ -61,12 +61,14 @@ LogLevel=DEBUG
+ EnableSyslog=1
+ SyslogLevel=DEBUG
+ 
+-[X11rdp]
+-param=X11rdp
+-param=-bs
++[Xorg]
++param=Xorg
++param=-config
++param=xrdp/xorg.conf
++param=-noreset
  param=-nolisten
  param=tcp
--param=-logfile
--param=/dev/null
+-param=-uds
 +param=-retro
  
+ [Xvnc]
+ param=Xvnc
+@@ -77,16 +79,6 @@ param=-localhost
+ param=-dpi
+ param=96
+ 
+-[Xorg]
+-param=Xorg
+-param=-config
+-param=xrdp/xorg.conf
+-param=-noreset
+-param=-nolisten
+-param=tcp
+-param=-logfile
+-param=/dev/null
+-
  [Chansrv]
  ; drive redirection, defaults to xrdp_client if not set
+ FuseMountName=thinclient_drives
 --- a/xrdp/xrdp.ini
 +++ b/xrdp/xrdp.ini
 @@ -145,16 +145,6 @@ tcutils=true

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