[debian-edu-commits] debian-edu/pkg-team/ 46/159: sync

[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 29265c8006caf995554f22df33af5446c7f92173
Author: mirabilos <tg at mirbsd.org>
Date:   Thu Aug 6 20:29:55 2015 +0200

    sync
---
 README.source | 4 ----
 copyright     | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.source b/README.source
index 5c184b9..08a1938 100644
--- a/README.source
+++ b/README.source
@@ -8,10 +8,6 @@ TODO:
     - Add an option in /etc/default/xrdp to avoid to restart on
       upgrade, thanks to a suggestion from Ola Lundqvist
 
-- merge some patches and other changes from Debian package
-  * user/group xrdp (XXX delete on purge?), Depends: adduser
-  * remove dirs and files on purge
-
 - d/control Description: can it now connect to X.org, too?
   => test!
 
diff --git a/copyright b/copyright
index 9929066..f99d1b3 100644
--- a/copyright
+++ b/copyright
@@ -42,7 +42,8 @@ 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…
 • PID path change
-• Fallback to en-us keymap
+• part of the maintainer scripts
+• patch to fall back to en-us keymap
 … is covered by the GNU GPLv2 or later, which can be found
 at /usr/share/common-licenses/GPL-2 on Debian systems.
 

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