This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 0e3b414ea6ecb6cc359d3b95f5cfeb6096066139 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 9 19:04:25 2014 +0200 Provide COPYING file in tarball. Update debian/copyright. --- debian/{copyright => COPYING.full+lite} | 12 ++++-------- debian/changelog | 2 +- debian/copyright | 6 +++++- debian/roll-tarballs.sh | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/copyright b/debian/COPYING.full+lite similarity index 85% copy from debian/copyright copy to debian/COPYING.full+lite index bbb5368..a2b32ef 100644 --- a/debian/copyright +++ b/debian/COPYING.full+lite @@ -1,7 +1,9 @@ -This package was created by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> on Thu Oct 10 22:53:56 CEST 2011 +The software components were originally downloaded from http://www.nomachine.com/sources.php -The software components were downloaded from http://www.nomachine.com/sources.php +The software has been improved via various patches by the X2Go project. +The patches reside in the subfolder doc/applied-patches/ of this source tree. +Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org/. Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. This program is free software; you can redistribute it and/or modify it @@ -51,9 +53,3 @@ The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - - -The packaging for Debian is copyright 2011 Mike Gabriel and is released -under the GPL version 2. On Debian systems, the complete text of the GNU -General Public License can be found in `/usr/share/common-licenses/GPL'. - diff --git a/debian/changelog b/debian/changelog index 5f54796..59028ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium - * Continue development... + * Provide COPYING file in tarball. Update debian/copyright. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 30 Jun 2014 15:05:54 +0200 diff --git a/debian/copyright b/debian/copyright index bbb5368..7fc55b6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,11 @@ This package was created by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> on Thu Oct 10 22:53:56 CEST 2011 -The software components were downloaded from http://www.nomachine.com/sources.php +The software components were originally downloaded from http://www.nomachine.com/sources.php +The software has been improved via various patches by the X2Go project. +The patches reside in the subfolder debian/patches/ of this source package. + +Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org. Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. This program is free software; you can redistribute it and/or modify it diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index eb106b6..6f7d712 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -97,6 +97,7 @@ else echo ${file##*/} >> doc/applied-patches/series done fi +cp -v debian/COPYING.full+lite COPYING # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git