[debian-edu-commits] debian-edu/pkg-team/ 17/159: xrdp-keygen.8 licence is GPLv2+ from Debian

[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 d5aaa8d67937097910be62f47cf13bfdd3ef2264
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Wed Mar 18 21:45:21 2015 +0100

    xrdp-keygen.8 licence is GPLv2+ from Debian
---
 copyright                   |  8 ++++++--
 patches/debian-manpage.diff | 11 +++++++++++
 patches/series              |  1 +
 source/local-options        |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/copyright b/copyright
index 1de9161..8d76f66 100644
--- a/copyright
+++ b/copyright
@@ -39,6 +39,11 @@ Some of the manual pages are also written by:
 Simone Fedele <ilsimo at users.sourceforge.net>
 Vincent Bernat <bernat at luffy.cx>
 
+The manual page xrdp-keygen.8 from Vincent Bernat, as well as
+everything else taken from the original Debian packaging (currently
+only the last few lines of debian/changelog) is covered by the GNU
+GPLv2 or later, at /usr/share/common-licenses/GPL-2 on Debian systems.
+
 
 common/ssl_calls.{c,h} are also Apache 2 from Jay Sorg and additionally:
 Copyright (C) Idan Freiberg 2013-2014
@@ -92,8 +97,7 @@ the terms in the top-level COPYING file (Apache 2 by Jay Sorg),
 if they are protected by copyright law at all.
 
 
-The xrdp-genkeymap program is covered by the GNU GPLv2 or later,
-at /usr/share/common-licenses/GPL-2 on Debian systems:
+The xrdp-genkeymap program is covered by the GNU GPLv2 or later:
 Copyright (C) Michał Górny 2014 <mgorny at gentoo.org>
 Copyright (C) Ádám Wallner 2008 <wallner at bitbaro.hu>
 The generated keymaps are a function of the keymaps shipped with
diff --git a/patches/debian-manpage.diff b/patches/debian-manpage.diff
new file mode 100644
index 0000000..94b5375
--- /dev/null
+++ b/patches/debian-manpage.diff
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..55b7b64
--- /dev/null
+++ b/patches/series
@@ -0,0 +1 @@
+debian-manpage.diff
diff --git a/source/local-options b/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/source/local-options
@@ -0,0 +1 @@
+unapply-patches

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