From 8a104d041e7be38a0e674a2cf2eeafb575de8940 Mon Sep 17 00:00:00 2001 From: John Goerzen Date: Wed, 4 Jul 2007 18:54:41 +0100 Subject: [PATCH] Updated copyright files Removed PSF license since we no longer distribute imaplib.py --- COPYRIGHT | 56 +----------------------------------------------- debian/copyright | 2 +- 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 9333130..61aae00 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ offlineimap Mail syncing software -Copyright (C) 2002 - 2006 John Goerzen +Copyright (C) 2002 - 2007 John Goerzen 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 @@ -15,57 +15,3 @@ Copyright (C) 2002 - 2006 John Goerzen along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -ONLY imaplib.py is Copyright (c) 2001 Python Software Foundation; -All Rights Reserved - -imaplib.py comes from Python dev tree and is licensed under the -GPL-compatible PSF license as follows: - - -PSF LICENSE AGREEMENT FOR PYTHON 2.2 ------------------------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.2 software in source or binary form and its -associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 2.2 -alone or in any derivative version, provided, however, that PSF's -License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001 Python Software Foundation; All Rights Reserved" are retained in -Python 2.2 alone or in any derivative version prepared by Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.2 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.2. - -4. PSF is making Python 2.2 available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.2 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -2.2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.2, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python 2.2, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. diff --git a/debian/copyright b/debian/copyright index 5635f7a..84f1b97 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ on Fri, 21 Jun 2002 14:54:56 -0500. The original source can always be found at: http://software.complete.org/offlineimap/ -Copyright (C) 2002 - 2006 John Goerzen +Copyright (C) 2002 - 2007 John Goerzen 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