Lower the timeout to 9 sec to reduce delays.

[quix0rs-apt-p2p.git] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 93bc824ef80c2e73b46ae91cc0be06d9fc520da3..999763bae6537fc29def14ece6ec975df202c0d4 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,18 +1,30 @@
 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-dht is Copyright (C) 2008 Cameron Dale <camrdale@gmail.com>
+Apt-p2p is Copyright (C) 2008 Cameron Dale <camrdale@gmail.com>
 
-Apt-dht is licensed under the terms of the GNU General Public License (GPL),
+Apt-p2p is licensed under the terms of the GNU General Public License (GPL),
 version 2 or later, as published by the Free Software Foundation.  See
 /usr/share/common-licenses/GPL, or <http://www.gnu.org/copyleft/gpl.txt>
 for the terms of the latest version of the GNU General Public License.
 
-The module apt_dht_Khashmir is a modified version of the original khashmir,
+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
+<http://www.gnu.org/copyleft/gpl.txt> and is covered by the following
+copyright:
+
+       Copyright (C) 2002 Manuel Estrada Sainz <ranty@debian.org>
+       Copyright (C) 2008 Cameron Dale <camrdale@gmail.com>
+
+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 <camrdale@gmail.com>
        
        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 <ranty@debian.org>
+       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 <camrdale@gmail.com>
+       
+       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.