[debian-edu-commits] debian-edu/pkg-team/ 125/159: refresh patches (merged)

[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 4bf9af6fd35e82af86921a17abef0e47c74a97ab
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Sep 1 17:52:07 2015 +0200

    refresh patches (merged)
---
 changelog               |  6 ++++++
 patches/make-fixes.diff | 17 -----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/changelog b/changelog
index ed50b3c..7a79424 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~git20150901+dfsg-1~beta1) teckids; urgency=medium
+
+  * Update from upstream git; drop merged patch
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Tue, 01 Sep 2015 17:51:41 +0200
+
 xrdp (0.9.0~git20150830+dfsg-1~beta2) teckids; urgency=medium
 
   * Adjust Recommends and add Provides for xorgxrdp setup
diff --git a/patches/make-fixes.diff b/patches/make-fixes.diff
index ebc0980..4975168 100644
--- a/patches/make-fixes.diff
+++ b/patches/make-fixes.diff
@@ -9,23 +9,6 @@
    xrdpapi \
 +  xorgxrdp \
    $(XRDPVRDIR)
---- a/instfiles/Makefile.am
-+++ b/instfiles/Makefile.am
-@@ -14,10 +14,14 @@ startscript_DATA = \
-   km-040c.ini \
-   km-0410.ini \
-   km-0411.ini \
-+  km-0414.ini \
-   km-0415.ini \
-+  km-0416.ini \
-   km-0419.ini \
-   km-041d.ini \
-   km-0807.ini \
-+  km-080c.ini \
-+  km-0813.ini \
-   km-0816.ini \
-   km-e0010411.ini \
-   km-e0200411.ini \
 --- a/xrdpapi/Makefile.am
 +++ b/xrdpapi/Makefile.am
 @@ -9,6 +9,7 @@ AM_CFLAGS = \

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