From b0438569dd9a7578dcc36df14079b142f717d6b1 Mon Sep 17 00:00:00 2001 From: thialme-guest Date: Mon, 9 Feb 2009 18:30:51 +0000 Subject: [PATCH] Removed copyright.new and updated copyrights for gpgdir and gpgwrap. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@411 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/copyright | 22 ++++++ debian/copyright.new | 181 ------------------------------------------- 2 files changed, 22 insertions(+), 181 deletions(-) delete mode 100644 debian/copyright.new diff --git a/debian/copyright b/debian/copyright index fb54671..510b479 100644 --- a/debian/copyright +++ b/debian/copyright @@ -82,3 +82,25 @@ License for keyanalyze: License version 2. On Debian/GNU systems, this can be found as /usr/share/common-licenses/GPL-2. + +License for gpgdir: + It was downloaded from http://www.cipherdyne.com/gpgdir/ + + Copyright: Copyright 2002-2009 by Michael B. Rash + + 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 for gpgwrap: + It was downloaded from http://unusedino.de/gpgwrap/ + + Copyright: Copyright 2004-2006 by Karsten Scheibler + + 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/ diff --git a/debian/copyright.new b/debian/copyright.new deleted file mode 100644 index 4ff6f3e..0000000 --- a/debian/copyright.new +++ /dev/null @@ -1,181 +0,0 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Upstream-Name: pgp-tools -Upstream-Maintainer: Thijs Kinkhorst -Upstream-Source: http://pgp-tools.alioth.debian.org/ - -http://www.cipherdyne.com/gpgdir/download/ -Files: gpgdir/* -Copyright: Copyright 2002-2008 by Michael B. Rash -License: GPL-2+ - -http://www.unusedino.de/gpgwrap/ -Files: gpgwrap/* -Copyright: Copyright 2004-2006 by Karsten Scheibler -License: GPL-2+ - -Files: gpgparticipants/* -Copyright: Copyright (c) 2008 Philippe Teuwen -License: GPL2+ - -Files: gpgparticipants/gpgparticipants.1 -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 -License: GPL2+ - -http://www.chaosreigns.com/code/sig2dot/ -Files: sig2dot/* -Copyright: Copyright (c) ??? Darxus@ChaosReigns.com -Copyright: Copyright (c) ???-2006 Kevin M. Rosenberg -Copyright: Copyright (c) 2005, 2006 Christoph Berg -License: GPL2+ - -http://www.chaosreigns.com/code/springgraph/ -Files: springgrpah/* -Copyright: Copyright (c) 2002-2003 Darxus@ChaosReigns.com -Copyright: Copyright (c) 2005 Christoph Berg -License: GPL2+ - -Files: gpg-mailkeys/* -Copyright: Copyright (c) 2001-2005 Simon Richter -Copyright: Copyright (c) 2001-2005 Thijs Kinkhorst -License: GPL2+ - -Files: springrpah/springgraph.1 -Copyright: Copyright (c) 2005 Kevin M. Rosenberg -License: GPL2+ - -Files: debian/* -Copyright: Copyright 2008-2009 Thijs Kinkhorst -License: GPL-2+ - -Files: gpglist/* -Copyright: Copyright (c) 2004 Uli Martens -Copyright: Copyright (c) 2005 Peter Palfrader -License: BSD-C3 - -Files: keylookup/* -Copyright: Copyright (c) 2000, 2002 Christian Kurz , -Copyright: Copyright (c) 2000, 2002, 2005 Peter Palfrader -License: BSD-C3 - -Files: caff/* -Copyright: Copyright (c) 2004-2006 Peter Palfrader -Copyright: Copyright (c) 2005-2007 Christoph Berg -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: 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 - modification, are permitted provided that the following conditions - 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. - 3. The name of the author may not be used to endorse or promote products - 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 - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - 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. \ No newline at end of file -- 2.39.5