From 498e5b11d0ffd1b0f716c30046bb54488305aba0 Mon Sep 17 00:00:00 2001 From: thialme-guest Date: Wed, 4 Feb 2009 00:12:22 +0000 Subject: [PATCH] Licenses are set to either GPL2+ or BSD-C3. Keyanalyze copyrights are splits (maybe too much). git-svn-id: svn://svn.debian.org/pgp-tools/trunk@410 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/copyright.new | 124 ++++++++++++++++++++++++++++++++----------- 1 file changed, 92 insertions(+), 32 deletions(-) diff --git a/debian/copyright.new b/debian/copyright.new index f3bf286..4ff6f3e 100644 --- a/debian/copyright.new +++ b/debian/copyright.new @@ -1,13 +1,8 @@ -DRAFT -There is still keyanalyze to finish - Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat Upstream-Name: pgp-tools Upstream-Maintainer: Thijs Kinkhorst Upstream-Source: http://pgp-tools.alioth.debian.org/ -/******************* Done ****************************/ - http://www.cipherdyne.com/gpgdir/download/ Files: gpgdir/* Copyright: Copyright 2002-2008 by Michael B. Rash @@ -27,9 +22,9 @@ Copyright: Copyright (c) 2008-2009 Thijs Kinkhorst License: GPL2+ Files: gpg-key2ps/* -Copyright: Copyright (C) 2001-2005 Simon Richter -Copyright: Copyright (C) 2005-2008 Thijs Kinkhorst -Copyright: Copyright (C) 2005-2008 Christoph Berg +Copyright: Copyright (c) 2001-2005 Simon Richter +Copyright: Copyright (c) 2005-2008 Thijs Kinkhorst +Copyright: Copyright (c) 2005-2008 Christoph Berg License: GPL2+ http://www.chaosreigns.com/code/sig2dot/ @@ -53,38 +48,114 @@ License: GPL2+ Files: springrpah/springgraph.1 Copyright: Copyright (c) 2005 Kevin M. Rosenberg License: GPL2+ - 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 2 of the License, or - (at your option) any later version. You can find a copy of it in your - Debian system under /usr/share/common-licenses/ Files: debian/* Copyright: Copyright 2008-2009 Thijs Kinkhorst License: GPL-2+ - Debian packaging is licensed under the same terms as the software itself - (see above). Files: gpglist/* Copyright: Copyright (c) 2004 Uli Martens Copyright: Copyright (c) 2005 Peter Palfrader -License: other +License: BSD-C3 Files: keylookup/* Copyright: Copyright (c) 2000, 2002 Christian Kurz , Copyright: Copyright (c) 2000, 2002, 2005 Peter Palfrader -License: other +License: BSD-C3 Files: caff/* Copyright: Copyright (c) 2004-2006 Peter Palfrader Copyright: Copyright (c) 2005-2007 Christoph Berg -License: other +License: BSD-C3 Files: gpgsigs/* Copyright: Copyright (c) 2004 Uli Martens Copyright: Copyright (c) 2004-2005 Peter Palfrader Copyright: Copyright (c) 2004-2007 Christoph Berg -License: other +License: BSD-C3 + +http://dtype.org/keyanalyze/code/ +Files: keyanalyse/* +Copyright: ???? +License: GPL2+ + +Files: keyanalyse/*.1 +Copyright: Copyright (c) 2004 Matthew Wilcox +License: GPL2+ + +Files: keyanalayse/keyanalyse.c +Copyright: Copyright (c) 2001 M. Drew Streib +Copyright: Copyright (c) 2001 Thomas Roessler +Copyright: Copyright (c) 2001 Hal J. Burch +Copyright: Copyright (c) 2001 Matt Kraai +Copyright: Copyright (c) 2001 Steve Langasek +License: GPL2+ + +Files: keyanalyze/process_keys.c +Copyright: Copyright (c) 2001 Thomas Roessler +License: GPL2+ + +Files: keyanalyse/pgpring/extlib.c +Copyright: Copyright (c) 1999-2000 Thomas Roessler +License: GPL2+ + +Files: keyanalyze/pgpring/lib.* +Copyright: Copyright (c) 1996-2000 Michael R. Elkins +Copyright: Copyright (c) 1999-2000 Thomas Roessler +License: GPL2+ + +Files: keyanalyze/pgpring/mkinstalldirs +Copyright: Copyright (c) 1993 Noah Friedman +License: GPL2+ + +Files: keyanalyze/pgpring/pgplib.c +Copyright: Copyright (c) 1997-2000 Thomas Roessler +License: GPL2+ + +Files: keyanalyse/pgpring/pgplib.h +Copyright: Copyright (c) 1996,1997 Michael R. Elkins +Copyright: Copyright (c) 1999-2000 Thomas Roessler +License: GPL2+ + +Files: keyanalyse/pgpring/pgppacket.* +Copyright: Copyright (c) 2001 Thomas Roessler +License: GPL2+ + +Files: keyanalyse/pgpring/pgppubring.c +Copyright: Copyright (c) 1997-2001 Thomas Roessler +License: GPL2+ + +Files: keyanalyse/pgpring/sha1.* +Copyright: Copyright (c) Steve Reid +Copyright: Copyright (c) Thomas Roessler +License: GPL2+ + +Files: keyanalyze/scripts/* keyanalyze/willy/* +Copyright: Copyright 2001 M. Drew Streib +License: GPL2+ + +Files: keyanalyze/scripts/top50.pl +Copyright: Copyright 2001 M. Drew Streib +Copyright: Copyright 2004-2008 Christoph Berg +License: GPL2+ + +Files: keyanalyze/willy/msd2html +Copyright: Copyright 2001 M. Drew Streib +Copyright: Copyright 2003-2004 Matthew Wilcox +License: GPL2+ + +Files: keyanalyze/willy/party-table.pl +Copyright: Copyright 2001 V. Alex Brennen +License: GPL2+ + +License: GPL2+ + 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 2 of the License, or + (at your option) any later version. You can find a copy of it in your + Debian system under /usr/share/common-licenses/ + +License: BSD-C3 All rights reserved. . Redistribution and use in source and binary forms, with or without @@ -96,7 +167,7 @@ License: other notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. + derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -107,15 +178,4 @@ License: other DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/****************************** End of done *********************/ - -http://dtype.org/keyanalyze/code/ -Files: keyanalyse/* -Copyright: Copyright (c) 2004-2008 Christphe Berg -Copyright: Copyright (c) 2004 Matthew Wilcox - process_keys.1/pgpring.1 -Copyright: Copyright (c) 2001 M Drew Strieb -Copyright: Copyright (c) 1997-2001 Thomas Roessler -Copyright: Copyright (c) 1996-2000 M R.Elkins - pgplib.h/lib.* -License: GPL-2+ + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file -- 2.39.5