r1889 - in zconfig/trunk/debian (changelog control)

[jinty-guest at users.alioth.debian.org]

    Date: Tuesday, November 24, 2009 @ 17:14:39
  Author: jinty-guest
Revision: 1889

debian/control: Conflict against zope3 (LP: #487536)

Modified:
  zconfig/trunk/debian/changelog
  zconfig/trunk/debian/control

Modified: zconfig/trunk/debian/changelog
===================================================================
--- zconfig/trunk/debian/changelog	2009-11-24 17:06:36 UTC (rev 1888)
+++ zconfig/trunk/debian/changelog	2009-11-24 17:14:39 UTC (rev 1889)
@@ -1,3 +1,9 @@
+zconfig (2.7.1-3) UNRELEASED; urgency=low
+
+  * debian/control: Conflict against zope3 (LP: #487536)
+
+ -- Brian Sutherland <brian at vanguardistas.net>  Tue, 24 Nov 2009 06:46:20 +0100
+
 zconfig (2.7.1-2) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: zconfig/trunk/debian/control
===================================================================
--- zconfig/trunk/debian/control	2009-11-24 17:06:36 UTC (rev 1888)
+++ zconfig/trunk/debian/control	2009-11-24 17:14:39 UTC (rev 1889)
@@ -14,6 +14,7 @@
 Provides: ${setuptools:Provides}, ${python:Provides}
 Suggests: ${setuptools:Suggests}
 Replaces: python-zodb, python2.4-zodb
+Conflicts: zope3
 XB-Python-Version: ${python:Versions}
 Description: Structured Configuration Library
  ZConfig is a configuration library intended for general use.  It