From 394d446ab8d4bdb7f010a81e97b7ff7898a99e4a Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Fri, 25 Apr 2008 19:38:39 -0700 Subject: [PATCH] Clean up the copyrights mentioned in the code. --- COPYRIGHT | 75 +++++++++++++++++++++++++++++++---- apt_p2p/policies.py | 4 -- apt_p2p_Khashmir/actions.py | 2 - apt_p2p_Khashmir/khash.py | 2 - apt_p2p_Khashmir/khashmir.py | 2 - apt_p2p_Khashmir/knode.py | 2 - apt_p2p_Khashmir/krpc.py | 2 - apt_p2p_Khashmir/ktable.py | 2 - apt_p2p_Khashmir/node.py | 2 - apt_p2p_Khashmir/util.py | 2 - debian/copyright | 77 +++++++++++++++++++++++++++++++----- debian/rules | 2 - 12 files changed, 136 insertions(+), 38 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 790dbe8..999763b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ Unless otherwise noted, all files are released under the GNU General -Public License, exceptions are noted below. +Public License, version 2 or later, exceptions are noted below. Apt-p2p is Copyright (C) 2008 Cameron Dale @@ -8,11 +8,23 @@ version 2 or later, as published by the Free Software Foundation. See /usr/share/common-licenses/GPL, or for the terms of the latest version of the GNU General Public License. +The file AptPackages.py is a modified version of packages.py from +the apt-proxy program, the source of which can found at +http://ftp.debian.org/debian/pool/main/a/apt-proxy/. +This file is also licensed under the terms of the GNU General +Public License, available in /usr/share/common-licenses/GPL or at + and is covered by the following +copyright: + + Copyright (C) 2002 Manuel Estrada Sainz + Copyright (C) 2008 Cameron Dale + The module apt_p2p_Khashmir is a modified version of the original khashmir, the source of which can be found at http://sourceforge.net/projects/khashmir. It is covered by the following copyright and permission notice: Copyright (C) 2002-2003 Andrew Loewenstern + Copyright (C) 2008 Cameron Dale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files @@ -34,11 +46,60 @@ It is covered by the following copyright and permission notice: connection with the Software or the use or other dealings in the Software. -The file AptPackages.py is a modified version of packages.py from -the apt-proxy program, the source of which can found at -http://ftp.debian.org/debian/pool/main/a/apt-proxy/. -This file is also licensed under the terms of the GNU General -Public License, and is covered by the following copyright: +The file policies.py is a modified version of policies.py from +the Twisted networking engine, the source of which can be found at +http://twistedmatrix.com. It is covered by the following copyright and +permission notice: - Copyright (C) 2002 Manuel Estrada Sainz + Copyright (c) 2001-2008 + Allen Short + Andrew Bennetts + Apple Computer, Inc. + Benjamin Bruheim + Bob Ippolito + Canonical Limited + Christopher Armstrong + David Reid + Donovan Preston + Eric Mangold + Itamar Shtull-Trauring + James Knight + Jason A. Mobarak + Jonathan Lange + Jonathan D. Simms + Jp Calderone + Jürgen Hermann + Kevin Turner + Mary Gardiner + Matthew Lefkowitz + Massachusetts Institute of Technology + Moshe Zadka + Paul Swartz + Pavel Pergamenshchik + Ralph Meijer + Sean Riley + Travis B. Hartwell + Thomas Herve + Eyal Lotem + Antoine Pitrou + Andy Gayton Copyright (C) 2008 Cameron Dale + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/apt_p2p/policies.py b/apt_p2p/policies.py index 9dc7ec8..a8578cb 100644 --- a/apt_p2p/policies.py +++ b/apt_p2p/policies.py @@ -1,7 +1,3 @@ -# -*- test-case-name: twisted.test.test_policies -*- -# Copyright (c) 2001-2007 Twisted Matrix Laboratories. -# See LICENSE for details. - """ Resource limiting policies. diff --git a/apt_p2p_Khashmir/actions.py b/apt_p2p_Khashmir/actions.py index bd1cd2f..fc8746c 100644 --- a/apt_p2p_Khashmir/actions.py +++ b/apt_p2p_Khashmir/actions.py @@ -1,5 +1,3 @@ -## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """Details of how to perform actions on remote peers.""" diff --git a/apt_p2p_Khashmir/khash.py b/apt_p2p_Khashmir/khash.py index 8df2cd9..3a763d1 100644 --- a/apt_p2p_Khashmir/khash.py +++ b/apt_p2p_Khashmir/khash.py @@ -1,5 +1,3 @@ -## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """Functions to deal with hashes (node IDs and keys). diff --git a/apt_p2p_Khashmir/khashmir.py b/apt_p2p_Khashmir/khashmir.py index 5db5ed8..cc188d8 100644 --- a/apt_p2p_Khashmir/khashmir.py +++ b/apt_p2p_Khashmir/khashmir.py @@ -1,5 +1,3 @@ -## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """The main Khashmir program.""" diff --git a/apt_p2p_Khashmir/knode.py b/apt_p2p_Khashmir/knode.py index 2cefe23..82eb988 100644 --- a/apt_p2p_Khashmir/knode.py +++ b/apt_p2p_Khashmir/knode.py @@ -1,5 +1,3 @@ -## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """Represents a khashmir node in the DHT.""" diff --git a/apt_p2p_Khashmir/krpc.py b/apt_p2p_Khashmir/krpc.py index 3a2e5b3..d4c0583 100644 --- a/apt_p2p_Khashmir/krpc.py +++ b/apt_p2p_Khashmir/krpc.py @@ -1,5 +1,3 @@ -## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """The KRPC communication protocol implementation. diff --git a/apt_p2p_Khashmir/ktable.py b/apt_p2p_Khashmir/ktable.py index f387898..007ff1c 100644 --- a/apt_p2p_Khashmir/ktable.py +++ b/apt_p2p_Khashmir/ktable.py @@ -1,5 +1,3 @@ -## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """The routing table and buckets for a kademlia-like DHT. diff --git a/apt_p2p_Khashmir/node.py b/apt_p2p_Khashmir/node.py index a5f40eb..e05e141 100644 --- a/apt_p2p_Khashmir/node.py +++ b/apt_p2p_Khashmir/node.py @@ -1,5 +1,3 @@ -## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """Represents a node in the DHT. diff --git a/apt_p2p_Khashmir/util.py b/apt_p2p_Khashmir/util.py index 626a860..966dc72 100644 --- a/apt_p2p_Khashmir/util.py +++ b/apt_p2p_Khashmir/util.py @@ -1,5 +1,3 @@ -## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved -# see LICENSE.txt for license information """Some utitlity functions for use in apt-p2p's khashmir DHT.""" diff --git a/debian/copyright b/debian/copyright index 14f9ef3..5217bf5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,16 +11,26 @@ The project homepage is at Apt-p2p is Copyright (C) 2008 Cameron Dale This software is released under the terms of the GNU General Public License, -with the exceptions noted below. +version 2 or later, with the exceptions noted below. -On Debian systems, the complete text of the GNU General Public License -can be found in /usr/share/common-licenses/GPL. +On Debian systems, the complete text of the GNU General Public License, +version 2, can be found in /usr/share/common-licenses/GPL-2. + +The file AptPackages.py is a modified version of packages.py from +the apt-proxy program, the source of which can found at +http://ftp.debian.org/debian/pool/main/a/apt-proxy/. +This file is also licensed under the terms of the GNU General +Public License, and is covered by the following copyright: + + Copyright (C) 2002 Manuel Estrada Sainz + Copyright (C) 2008 Cameron Dale The module apt_p2p_Khashmir is a modified version of the original khashmir, the source of which can be found at http://sourceforge.net/projects/khashmir. It is covered by the following copyright and permission notice: Copyright (C) 2002-2003 Andrew Loewenstern + Copyright (C) 2008 Cameron Dale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files @@ -42,11 +52,60 @@ It is covered by the following copyright and permission notice: connection with the Software or the use or other dealings in the Software. -The file AptPackages.py is a modified version of packages.py from -the apt-proxy program, the source of which can found at -http://ftp.debian.org/debian/pool/main/a/apt-proxy/. -This file is also licensed under the terms of the GNU General -Public License, and is covered by the following copyright: +The file policies.py is a modified version of policies.py from +the Twisted networking engine, the source of which can be found at +http://twistedmatrix.com. It is covered by the following copyright and +permission notice: - Copyright (C) 2002 Manuel Estrada Sainz + Copyright (c) 2001-2008 + Allen Short + Andrew Bennetts + Apple Computer, Inc. + Benjamin Bruheim + Bob Ippolito + Canonical Limited + Christopher Armstrong + David Reid + Donovan Preston + Eric Mangold + Itamar Shtull-Trauring + James Knight + Jason A. Mobarak + Jonathan Lange + Jonathan D. Simms + Jp Calderone + Jürgen Hermann + Kevin Turner + Mary Gardiner + Matthew Lefkowitz + Massachusetts Institute of Technology + Moshe Zadka + Paul Swartz + Pavel Pergamenshchik + Ralph Meijer + Sean Riley + Travis B. Hartwell + Thomas Herve + Eyal Lotem + Antoine Pitrou + Andy Gayton Copyright (C) 2008 Cameron Dale + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/rules b/debian/rules index 3adae64..dab7b0f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,4 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -- 2.39.5