r1707 - in zope.testing/trunk/debian (changelog control)

[Fabio Tranchitella]

    Date: Friday, August 28, 2009 @ 08:47:25
  Author: kobold
Revision: 1707

debian/control: added conflict with zope3.

Modified:
  zope.testing/trunk/debian/changelog
  zope.testing/trunk/debian/control

Modified: zope.testing/trunk/debian/changelog
===================================================================
--- zope.testing/trunk/debian/changelog	2009-08-28 08:45:43 UTC (rev 1706)
+++ zope.testing/trunk/debian/changelog	2009-08-28 08:47:25 UTC (rev 1707)
@@ -3,8 +3,9 @@
   * New upstream release.
   * Standards-Version: 3.8.3, no changed required.
   * debian/rules: fixed FTBFS with Python 2.6. (Closes: #543230)
+  * debian/control: added conflict with zope3.
 
- -- Fabio Tranchitella <kobold at debian.org>  Fri, 28 Aug 2009 10:44:59 +0200
+ -- Fabio Tranchitella <kobold at debian.org>  Fri, 28 Aug 2009 10:47:34 +0200
 
 zope.testing (3.7.4-4) unstable; urgency=low
 

Modified: zope.testing/trunk/debian/control
===================================================================
--- zope.testing/trunk/debian/control	2009-08-28 08:45:43 UTC (rev 1706)
+++ zope.testing/trunk/debian/control	2009-08-28 08:47:25 UTC (rev 1707)
@@ -13,6 +13,7 @@
 Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Recommends: ${setuptools:Recommends}
+Conflicts: zope3
 XB-Python-Version: ${python:Versions}
 Description: the zope testing framework, including the testrunner script
  This package provides a number of testing frameworks. It includes a flexible