[debian-edu-commits] debian-edu/pkg-team/ 113/159: remove © situation for ses{admin,test}; upstream’d but not here yet
Dominik George
natureshadow-guest at moszumanska.debian.org
Tue Feb 23 10:04:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository xrdp.
commit b3afb988ff4b82bbf7741c01e249a284d664176b
Author: mirabilos <t.glaser at tarent.de>
Date: Fri Aug 28 12:35:55 2015 +0200
remove © situation for ses{admin,test}; upstream’d but not here yet
---
README.source | 8 --------
copyright | 7 +++----
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/README.source b/README.source
index 8ad2846..6b3fd4f 100644
--- a/README.source
+++ b/README.source
@@ -12,14 +12,6 @@ TODO:
- create upgrade path from xrdb-in-debian (conffiles, piuparts, etc.)
-- contact Simone Fedele about
- * manpage licence (though probably fine as-is)
- * sesman/tools/sestest.c
-
-- remove sesman/tools/sestest.c unless free'd
- * unhook from Makefile.am
- ⇒ fed upstream
-
- replace xorg/tests/xdemo/yosemite.bmp
⇒ fed upstream
diff --git a/copyright b/copyright
index 2843b20..1fb8943 100644
--- a/copyright
+++ b/copyright
@@ -89,6 +89,9 @@ sesman/chansrv/pulse/module-xrdp-source.c is GNU GPLv2 or later:
Copyright 2004-2008 Lennart Poettering
Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+sesman/tools/ses{admin,test}.c are GNU GPLv2 or later:
+(c) 2008 Simone Fedele
+
tests/gtcp_proxy/{gtcp-proxy,hexdump}.c are Apache 2 from:
Copyright (C) Laxmikant Rashinkar 2013 LK.Rashinkar at gmail.com
@@ -182,9 +185,6 @@ from FreeBSD ports and is covered by the FreeBSD licence:
policies, either expressed or implied, of the FreeBSD Project.
-sesman/tools/ses{admin,test}.c are under no explicit licence,
-(c) 2008 Simone Fedele
-
xorg/tests/xdemo/yosemite.bmp is a derived work of two images from
http://www.appstate.edu/~marshallst/photos/boone_photos/yosemite_valley.html
and lack a proper licence.
@@ -235,5 +235,4 @@ Copyright 2014 Laxmikant Rashinkar
Several files and resources have unclear status and sources:
• missing explicit licence (see above) but require one:
- – sesman/tools/ses{admin,test}.c
– xorg/tests/xdemo/yosemite.bmp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git
More information about the debian-edu-commits
mailing list