[Checkins] SVN: gocept.zeoraid/trunk/ License and copyright cleanup.

Christian Theune ct at gocept.com
Tue Mar 16 10:31:07 EDT 2010


Log message for revision 109987:
  License and copyright cleanup.
  

Changed:
  U   gocept.zeoraid/trunk/COPYRIGHT.txt
  U   gocept.zeoraid/trunk/LICENSE.txt
  U   gocept.zeoraid/trunk/bootstrap.py
  U   gocept.zeoraid/trunk/setup.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/__init__.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/datatypes.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/filestorage.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/interfaces.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/controller.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/recipe.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/tests.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/testing.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/tests/failingstorage.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/tests/loggingstorage.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_recovery.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_zeo.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/utils.py

-=-
Modified: gocept.zeoraid/trunk/COPYRIGHT.txt
===================================================================
--- gocept.zeoraid/trunk/COPYRIGHT.txt	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/COPYRIGHT.txt	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,9 +1 @@
-Copyright (c) 2007-2008 Zope Foundation 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.
+Zope Foundation and Contributors

Modified: gocept.zeoraid/trunk/LICENSE.txt
===================================================================
--- gocept.zeoraid/trunk/LICENSE.txt	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/LICENSE.txt	2010-03-16 14:31:07 UTC (rev 109987)
@@ -21,7 +21,8 @@
 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 the copyright
+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.
 
@@ -32,13 +33,12 @@
 Disclaimer
 
 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
+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 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; 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.
-
+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.

Modified: gocept.zeoraid/trunk/bootstrap.py
===================================================================
--- gocept.zeoraid/trunk/bootstrap.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/bootstrap.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/setup.py
===================================================================
--- gocept.zeoraid/trunk/setup.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/setup.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Corporation and Contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -18,29 +18,28 @@
 
 name = "gocept.zeoraid"
 setup(
-    name = name,
-    version = '1.0b8dev',
-    author = "Christian Theune",
-    author_email = "ct at gocept.com",
-    description = "A ZODB storage for replication using RAID techniques.",
-    long_description = open('README.txt').read(),
-    license = "ZPL 2.1",
-    keywords = "zodb buildout",
-    classifiers = ["Framework :: Buildout"],
+    name=name,
+    version='1.0b8dev',
+    author="Zope Foundation and Contributors",
+    author_email="ct at gocept.com",
+    description="A ZODB storage for replication using RAID techniques.",
+    long_description=open('README.txt').read(),
+    license="ZPL 2.1",
+    keywords="zodb buildout",
+    classifiers=["Framework :: Buildout"],
     url='http://pypi.python.org/pypi/gocept.zeoraid',
     zip_safe=False,
-    packages = find_packages('src'),
-    include_package_data = True,
-    package_dir = {'':'src'},
-    namespace_packages = ['gocept'],
-    install_requires = ['setuptools',
-                        'zc.zodbrecipes',
-                        'ZODB3>=3.9dev'],
-    entry_points = """
+    packages=find_packages('src'),
+    include_package_data=True,
+    package_dir={'': 'src'},
+    namespace_packages=['gocept'],
+    install_requires=['setuptools',
+                      'zc.zodbrecipes',
+                      'ZODB3>=3.9dev'],
+    entry_points="""
         [zc.buildout]
         server = gocept.zeoraid.scripts.recipe:ZEORAIDServer
 
         [console_scripts]
         zeoraid = gocept.zeoraid.scripts.controller:main
-        """,
-    )
+        """)

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/__init__.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/__init__.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/__init__.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/datatypes.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/datatypes.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/datatypes.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/filestorage.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/filestorage.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/filestorage.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/interfaces.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/interfaces.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/interfaces.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/controller.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/controller.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/controller.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/recipe.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/recipe.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/recipe.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Zope Foundation and contributors.
+# Copyright (c) 2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/tests.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/tests.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/tests.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Zope Corporation and Contributors.
+# Copyright (c) 2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/testing.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/testing.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/testing.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/tests/failingstorage.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/tests/failingstorage.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/tests/failingstorage.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/tests/loggingstorage.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/tests/loggingstorage.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/tests/loggingstorage.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_recovery.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_recovery.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_recovery.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_zeo.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_zeo.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_zeo.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/utils.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/utils.py	2010-03-16 14:25:41 UTC (rev 109986)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/utils.py	2010-03-16 14:31:07 UTC (rev 109987)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007-2008 Zope Foundation and contributors.
+# Copyright (c) 2007-2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,



More information about the checkins mailing list