r1703 - in zope.proxy/trunk/debian (changelog control)

[Matthias Klose]

    Date: Wednesday, August 26, 2009 @ 09:04:26
  Author: doko
Revision: 1703

  * Conflict with zope3. Closes: #538180.
  * Bump standards version.

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

Modified: zope.proxy/trunk/debian/changelog
===================================================================
--- zope.proxy/trunk/debian/changelog	2009-08-26 08:18:02 UTC (rev 1702)
+++ zope.proxy/trunk/debian/changelog	2009-08-26 09:04:26 UTC (rev 1703)
@@ -1,3 +1,10 @@
+zope.proxy (3.5.0-2) UNRELEASED; urgency=low
+
+  * Conflict with zope3. Closes: #538180.
+  * Bump standards version.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 26 Aug 2009 10:52:06 +0200
+
 zope.proxy (3.5.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: zope.proxy/trunk/debian/control
===================================================================
--- zope.proxy/trunk/debian/control	2009-08-26 08:18:02 UTC (rev 1702)
+++ zope.proxy/trunk/debian/control	2009-08-26 09:04:26 UTC (rev 1703)
@@ -4,7 +4,7 @@
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
 Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.interface/trunk
 
@@ -13,6 +13,7 @@
 Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${setuptools:Provides}, ${python:Provides}
 Suggests: ${setuptools:Suggests}
+Conflicts: zope3
 XB-Python-Version: ${python:Versions}
 Description: generic transparent proxies for Python
  Proxies are special objects which serve as mostly-transparent wrappers around