[debian-edu-commits] debian-edu/pkg-team/ 73/159: this patch has been merged upstream

[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 33f9e528e5cc02d6b720982cf5bf0ecefed2af01
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 26 19:10:04 2015 +0200

    this patch has been merged upstream
---
 patches/debian-manpage.diff | 14 --------------
 patches/series              |  1 -
 2 files changed, 15 deletions(-)

diff --git a/patches/debian-manpage.diff b/patches/debian-manpage.diff
deleted file mode 100644
index 594f3d7..0000000
--- a/patches/debian-manpage.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# DP: fix upstream oversight
-# DP: should be submitted upstream
-
---- a/docs/man/xrdp-keygen.8
-+++ b/docs/man/xrdp-keygen.8
-@@ -1,4 +1,8 @@
- .\"                                      Hey, EMACS: -*- nroff -*-
-+.\"-
-+.\" Copyright © 2007, 2008 Vincent Bernat <bernat at debian.org>
-+.\" License: GPL-2+
-+.\"-
- .TH xrdp\-keygen 8 "0.7.0" "xrdp team"
- .SH NAME
- xrdp\-keygen \- xrdp RSA key generation utility
diff --git a/patches/series b/patches/series
index 134fc94..4f4a587 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
-debian-manpage.diff
 libtoolise.diff
 make-fixes.diff
 config.diff

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