[Zodb-checkins] CVS: StandaloneZODB/ZODB - TimeStamp.c:1.9.4.2 cPersistence.c:1.46.10.2 cPersistence.h:1.19.100.2 cPickleCache.c:1.36.10.2 coptimizations.c:1.13.10.2 winlock.c:1.5.100.2

Jeremy Hylton jeremy@zope.com
Fri, 30 Nov 2001 13:42:49 -0500


Update of /cvs-repository/StandaloneZODB/ZODB
In directory cvs.zope.org:/tmp/cvs-serv9702

Modified Files:
      Tag: StandaloneZODB-1_0-branch
	TimeStamp.c cPersistence.c cPersistence.h cPickleCache.c 
	coptimizations.c winlock.c 
Log Message:
Merge changes from the trunk.

The primary change is the way the copyright notice is formatted.


=== StandaloneZODB/ZODB/TimeStamp.c 1.9.4.1 => 1.9.4.2 ===
-  
-  Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 
+  Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+  
   This software is subject to the provisions of the Zope Public License,
-  Version 1.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.
+  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
   
  ****************************************************************************/
 


=== StandaloneZODB/ZODB/cPersistence.c 1.46.10.1 => 1.46.10.2 ===
-  
-  Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 
+  Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+  
   This software is subject to the provisions of the Zope Public License,
-  Version 1.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.
+  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
   
  ****************************************************************************/
 static char cPersistence_doc_string[] = 


=== StandaloneZODB/ZODB/cPersistence.h 1.19.100.1 => 1.19.100.2 ===
   
-  Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
+ Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 
-  This software is subject to the provisions of the Zope Public License,
-  Version 1.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.
+ 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
   
  ****************************************************************************/
 


=== StandaloneZODB/ZODB/cPickleCache.c 1.36.10.1 => 1.36.10.2 ===
-  
-  Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 
+  Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+  
   This software is subject to the provisions of the Zope Public License,
-  Version 1.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.
+  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
   
  ****************************************************************************/
 static char cPickleCache_doc_string[] = 


=== StandaloneZODB/ZODB/coptimizations.c 1.13.10.1 => 1.13.10.2 ===
 
-  Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
-
+  Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+  
   This software is subject to the provisions of the Zope Public License,
-  Version 1.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.
+  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
   
  ****************************************************************************/
 #include "Python.h"


=== StandaloneZODB/ZODB/winlock.c 1.5.100.1 => 1.5.100.2 ===
-  
-  Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 
+  Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+  
   This software is subject to the provisions of the Zope Public License,
-  Version 1.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.
-
+  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
+  
  ****************************************************************************/
 static char winlock_doc_string[] = 
 "Lock files on Windows."