[debian-edu-commits] debian-edu/pkg-team/ 137/159: (hopefully last) round of fixing; rest lgtm already

[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 8f923db850953ffc7236485b0b3491855b4b6881
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Sep 1 19:54:17 2015 +0200

    (hopefully last) round of fixing; rest lgtm already
---
 changelog               | 4 ++--
 patches/misc-fixes.diff | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index aebeaf0..729fb03 100644
--- a/changelog
+++ b/changelog
@@ -13,9 +13,9 @@ xrdp (0.9.0~git20150901+dfsg-1~beta1) teckids; urgency=medium
     asking the admin to review configs and ensure packages are installed,
     and documenting that SESMAN_START is ignored by systemd
   * Document RESTART_ON_UPGRADE is now obsolete (always "no")
-  * Fix several more warnings
+  * Fix several more warnings and do not underlink libraries
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Tue, 01 Sep 2015 19:43:03 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Tue, 01 Sep 2015 19:53:55 +0200
 
 xrdp (0.9.0~git20150830+dfsg-1~beta2) teckids; urgency=medium
 
diff --git a/patches/misc-fixes.diff b/patches/misc-fixes.diff
index 34b65ad..d9cacb3 100644
--- a/patches/misc-fixes.diff
+++ b/patches/misc-fixes.diff
@@ -41,19 +41,21 @@
          break;
 --- a/sesman/chansrv/chansrv_fuse.c
 +++ b/sesman/chansrv/chansrv_fuse.c
-@@ -60,6 +60,8 @@ char g_fuse_clipboard_path[256] = ""; /*
+@@ -60,6 +60,9 @@ char g_fuse_clipboard_path[256] = ""; /*
  
  #include "arch.h"
  #include "chansrv_fuse.h"
++#include "chansrv.h"
 +#include "devredir.h"
 +#include "file.h"
  
  /* dummy calls when XRDP_FUSE is not defined */
  int xfuse_init()                { return 0; }
-@@ -106,6 +108,8 @@ void xfuse_devredir_cb_file_close(void *
+@@ -106,6 +109,9 @@ void xfuse_devredir_cb_file_close(void *
  #include "chansrv_fuse.h"
  #include "list.h"
  #include "fifo.h"
++#include "chansrv.h"
 +#include "devredir.h"
 +#include "file.h"
  

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