[debian-edu-commits] debian-edu/ 05/22: Refresh patches.

[Dominik George]

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

natureshadow-guest pushed a commit to branch fix-repo
in repository xrdp.

commit 007ef196470831a35c207b952a40b9428cc9ce35
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 27 20:46:55 2016 +0200

    Refresh patches.
---
 debian/patches/make-fixes.diff | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/debian/patches/make-fixes.diff b/debian/patches/make-fixes.diff
index 131d31c..1f4bed6 100644
--- a/debian/patches/make-fixes.diff
+++ b/debian/patches/make-fixes.diff
@@ -49,30 +49,3 @@
  CFLAGS="$save_CFLAGS"
  
  AC_SUBST([moduledir], '${libdir}/xrdp')
---- a/xrdp/Makefile.am
-+++ b/xrdp/Makefile.am
-@@ -11,7 +11,7 @@ endif
- if XRDP_RFXCODEC
- EXTRA_DEFINES += -DXRDP_RFXCODEC
- EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
--EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a
-+EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.la
- endif
- 
- if XRDP_PIXMAN
---- a/xrdpapi/Makefile.am
-+++ b/xrdpapi/Makefile.am
-@@ -4,6 +4,7 @@ EXTRA_LIBS =
- EXTRA_FLAGS =
- 
- AM_CPPFLAGS = \
-+  -I$(top_srcdir)/common \
-   $(EXTRA_DEFINES) \
-   $(EXTRA_INCLUDES)
- 
-@@ -18,4 +19,5 @@ libxrdpapi_la_LDFLAGS = \
-   $(EXTRA_FLAGS)
- 
- libxrdpapi_la_LIBADD = \
-+  $(top_builddir)/common/libcommon.la \
-   $(EXTRA_LIBS)

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