[z3-checkins] r5207 - in z3/Five/trunk: . doc
philikon at codespeak.net
philikon at codespeak.net
Mon Jun 21 19:14:28 MEST 2004
Author: philikon
Date: Mon Jun 21 19:14:23 2004
New Revision: 5207
Added:
z3/Five/trunk/COPYING.txt
z3/Five/trunk/doc/ZopePublicLicense.txt
- copied, changed from r5202, z3/Five/trunk/ZopePublicLicense.txt
Removed:
z3/Five/trunk/BSD.txt
z3/Five/trunk/LICENSES.txt
z3/Five/trunk/ZopePublicLicense.txt
Log:
Five is under ZPL 2.1 now. Don't thank me, thank Martijn.
Renamed LICENSES.txt to COPYING.txt; get rid of BSD.txt; move ZopePublicLicense.txt
to doc/ subdir.
Deleted: /z3/Five/trunk/BSD.txt
==============================================================================
--- /z3/Five/trunk/BSD.txt Mon Jun 21 19:14:23 2004
+++ (empty file)
@@ -1,30 +0,0 @@
-$Revision: 1.1 $
-Copyright (c) 2004 Infrae. 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. Neither the name of Infrae nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"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 INFRAE OR
-CONTRIBUTORS 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.
Added: z3/Five/trunk/COPYING.txt
==============================================================================
--- (empty file)
+++ z3/Five/trunk/COPYING.txt Mon Jun 21 19:14:23 2004
@@ -0,0 +1,31 @@
+Five is distributed under the provisions of the Zope Public License
+(ZPL) v2.1. See doc/ZopePublicLicense.txt for the license text.
+
+
+Copyright (C) 2004 Five Contributors:
+
+ - Martijn Faassen (faassen at infrae.com)
+
+ - Sidnei da Silva (sidnei at awkly.org)
+
+ - Philipp von Weitershausen (philikon at philikon.de)
+
+
+Five contains source derived from:
+
+ - Zope 3, copyright (C) 2001-2004 by Zope Corporation. Code that
+ falls under this copyright is prefixed with the following header:
+
+ Copyright (c) 2001-2004 Zope Corporation and Contributors.
+ All Rights Reserved.
+
+ This software is subject to the provisions of the Zope Public License,
+ Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+ WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+ FOR A PARTICULAR PURPOSE.
+
+ - metaclass.py is derived from PEAK, copyright (C) 1996-2004 by
+ Phillip J. Eby and Tyler C. Sarna. PEAK may be used under the same
+ terms as Zope.
Deleted: /z3/Five/trunk/LICENSES.txt
==============================================================================
--- /z3/Five/trunk/LICENSES.txt Mon Jun 21 19:14:23 2004
+++ (empty file)
@@ -1,23 +0,0 @@
-Part of this software is derived from Zope 3. These parts are licensed under
-the Zope Public License, contained ZopePublicLicense.txt.
-
-The parts directly derived from Zope 3 source code are marked by the
-following block.
-
-"""
-Copyright (c) 2001, 2002, 2003 Zope Corporation and Contributors.
-All Rights Reserved.
-
-This software is subject to the provisions of the Zope Public License,
-Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-FOR A PARTICULAR PURPOSE.
-"""
-
-metaclass.py is derived from PEAK, copyright (C) 1996-2004 by Phillip
-J. Eby and Tyler C. Sarna. PEAK may be used under the same terms as Zope.
-
-The rest of the software falls under the BSD license and is copyright
-Infrae. This license is listed in BSD.txt.
Deleted: /z3/Five/trunk/ZopePublicLicense.txt
==============================================================================
--- /z3/Five/trunk/ZopePublicLicense.txt Mon Jun 21 19:14:23 2004
+++ (empty file)
@@ -1,59 +0,0 @@
-Zope Public License (ZPL) Version 2.0
------------------------------------------------
-
-This software is Copyright (c) Zope Corporation (tm) and
-Contributors. All rights reserved.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in 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 Zope Corporation (tm) must not be used to
- endorse or promote products derived from this software
- without prior written permission from Zope Corporation.
-
-4. The right to distribute this software or to use it for
- any purpose does not give you the right to use Servicemarks
- (sm) or Trademarks (tm) of Zope Corporation. Use of them is
- covered in a separate agreement (see
- http://www.zope.com/Marks).
-
-5. If any files are modified, you must cause the modified
- files to carry prominent notices stating that you changed
- the files and the date of any change.
-
-Disclaimer
-
- THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
- AND ANY EXPRESSED 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 ZOPE CORPORATION OR ITS CONTRIBUTORS 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.
-
-
-This software consists of contributions made by Zope
-Corporation and many individuals on behalf of Zope
-Corporation. Specific attributions are listed in the
-accompanying credits file.
Copied: z3/Five/trunk/doc/ZopePublicLicense.txt (from r5202, z3/Five/trunk/ZopePublicLicense.txt)
==============================================================================
--- z3/Five/trunk/ZopePublicLicense.txt (original)
+++ z3/Five/trunk/doc/ZopePublicLicense.txt Mon Jun 21 19:14:23 2004
@@ -1,8 +1,8 @@
-Zope Public License (ZPL) Version 2.0
------------------------------------------------
+Zope Public License (ZPL) Version 2.1
+-------------------------------------
-This software is Copyright (c) Zope Corporation (tm) and
-Contributors. All rights reserved.
+A copyright notice accompanies this license document that
+identifies the copyright holders.
This license has been certified as open source. It has also
been designated as GPL compatible by the Free Software
@@ -12,24 +12,25 @@
without modification, are permitted provided that the
following conditions are met:
-1. Redistributions in 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.
+1. Redistributions in source code must retain the
+ accompanying copyright notice, this list of conditions,
+ and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
-3. The name Zope Corporation (tm) must not be used to
+3. Names of the copyright holders must not be used to
endorse or promote products derived from this software
- without prior written permission from Zope Corporation.
+ without prior written permission from the copyright
+ holders.
4. The right to distribute this software or to use it for
- any purpose does not give you the right to use Servicemarks
- (sm) or Trademarks (tm) of Zope Corporation. Use of them is
- covered in a separate agreement (see
- http://www.zope.com/Marks).
+ any purpose does not give you the right to use
+ Servicemarks (sm) or Trademarks (tm) of the copyright
+ holders. Use of them is covered by separate agreement
+ with the copyright holders.
5. If any files are modified, you must cause the modified
files to carry prominent notices stating that you changed
@@ -37,11 +38,11 @@
Disclaimer
- THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
AND ANY EXPRESSED 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 ZOPE CORPORATION OR ITS CONTRIBUTORS BE
+ NO EVENT SHALL THE COPYRIGHT HOLDERS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -51,9 +52,3 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
-
-
-This software consists of contributions made by Zope
-Corporation and many individuals on behalf of Zope
-Corporation. Specific attributions are listed in the
-accompanying credits file.
More information about the z3-checkins
mailing list