r711 - zodb/trunk/debian

[Fabio Tranchitella]

Author: kobold
Date: 2007-03-12 06:16:34 +0000 (Mon, 12 Mar 2007)
New Revision: 711

Modified:
   zodb/trunk/debian/changelog
   zodb/trunk/debian/control
Log:
Preparing the new release.


Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog	2007-03-07 10:51:52 UTC (rev 710)
+++ zodb/trunk/debian/changelog	2007-03-12 06:16:34 UTC (rev 711)
@@ -1,3 +1,9 @@
+zodb (3.6.0-6) unstable; urgency=high
+
+  * debian/control: conflict with zope3. (Closes: #411472)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Mon, 12 Mar 2007 07:14:00 +0100
+
 zodb (3.6.0-5) unstable; urgency=low
 
   * Drop dependencies on versioned interpreters.

Modified: zodb/trunk/debian/control
===================================================================
--- zodb/trunk/debian/control	2007-03-07 10:51:52 UTC (rev 710)
+++ zodb/trunk/debian/control	2007-03-12 06:16:34 UTC (rev 711)
@@ -11,8 +11,8 @@
 Package: python-zodb
 Architecture: any
 Depends: ${python:Depends}, python-zopeinterface, ${shlibs:Depends}
-Replaces: python2.3-zodb, python2.4-zodb
-Conflicts: python2.3-zodb, python2.4-zodb
+Replaces: python2.3-zodb, python2.4-zodb, zope3
+Conflicts: python2.3-zodb, python2.4-zodb, zope3
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: set of tools for using the Zope Object Database (ZODB)