[med-svn] r7429 - trunk/packages/velvet/trunk/debian
Andreas Tille
tille at alioth.debian.org
Fri Aug 12 13:29:51 UTC 2011
Author: tille
Date: 2011-08-12 13:29:51 +0000 (Fri, 12 Aug 2011)
New Revision: 7429
Modified:
trunk/packages/velvet/trunk/debian/copyright
Log:
Revised velvet copyright, remove entries for zlib again because it turns out to be too complicated to mention all those different copyrights :-(
Modified: trunk/packages/velvet/trunk/debian/copyright
===================================================================
--- trunk/packages/velvet/trunk/debian/copyright 2011-08-12 06:15:06 UTC (rev 7428)
+++ trunk/packages/velvet/trunk/debian/copyright 2011-08-12 13:29:51 UTC (rev 7429)
@@ -1,69 +1,48 @@
-Machine-readable license summary, see ‘http://dep.debian.net/deps/dep5/’.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Velvet
+Upstream-Contact: Daniel Zerbino <zerbino at ebi.ac.uk>
+Source : http://www.ebi.ac.uk/~zerbino/velvet/
-Name : Velvet
-Contact : Daniel Zerbino <zerbino at ebi.ac.uk>
-Source : http://www.ebi.ac.uk/~zerbino/velvet/velvet_0.7.56.tgz
-
-Copyright: © 2006-2010 Daniel Zerbino <zerbino at ebi.ac.uk>
+Files: *
+Copyright: © 2006-2011 Daniel Zerbino <zerbino at ebi.ac.uk>
© 2000-2005 Guy St.C. Slater <guy at ebi.ac.uk>
© 2009 John Marshall <jm18 at sanger.ac.uk>
© 2009 David Studholme <david.studholme at tsl.ac.uk>
License: GPL-2+
-
- Velvet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Velvet is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Velvet; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public
-License version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
-
-Files: src/fibpriv.h
- src/dfib.c
- src/fib.h
- src/fib.c
- src/dfib.h
- src/dfibpriv.h
-License: GPL-2+ and other.
- Copyright 2007, 2008 Daniel Zerbino (zerbino at ebi.ac.uk)
-
- This file is part of Velvet.
-
Velvet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+ .
Velvet is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License
along with Velvet; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Copyright 1997, 1999-2003 John-Mark Gurney.
+Comment: On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
+
+Files: src/fibpriv.h
+ src/dfib.c
+ src/fib.h
+ src/fib.c
+ src/dfib.h
+ src/dfibpriv.h
+Copyright: © 1997, 1999-2003 John-Mark Gurney.
All rights reserved.
-
+ .
Redistribution and use in source and binary forms, with or without
-
+ .
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -90,44 +69,23 @@
Copyright: 2009, Torsten Seemann
2009, Daniel Zerbino
License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+Comment: On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in ‘/usr/share/common-licenses/GPL-3’.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General Public
-License version 3 can be found in ‘/usr/share/common-licenses/GPL-3’.
-
Files: debian/*
Copyright: 2008-2009 Charles Plessy <plessy at debian.org>
- 2008-2009 Andreas Tille <tille at debian.org>,
+ 2008-2011 Andreas Tille <tille at debian.org>
+ 2011 Tim Booth <tbooth at ceh.ac.uk>
License: Same as velvet
-
-Files: third-party/zlib*
-Copyright: 1995-1998 Jean-loup Gailly and Mark Adler
-License:
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 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.
-
More information about the debian-med-commit
mailing list