[Python-apps-commits] r7008 - in packages/slapos.tool.grid/trunk/debian (control)

[arnau at users.alioth.debian.org]

    Date: Friday, April 29, 2011 @ 07:43:25
  Author: arnau
Revision: 7008

Conflict against python-zc.buildout as explained in fix_zc.buildout_conflicts.patch

Modified:
  packages/slapos.tool.grid/trunk/debian/control

Modified: packages/slapos.tool.grid/trunk/debian/control
===================================================================
--- packages/slapos.tool.grid/trunk/debian/control	2011-04-29 07:40:58 UTC (rev 7007)
+++ packages/slapos.tool.grid/trunk/debian/control	2011-04-29 07:43:25 UTC (rev 7008)
@@ -16,9 +16,9 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
-         python-zc.buildout (>= 1.5.0),
          slapformat
 Breaks: ${python:Breaks}
+Conflicts: python-zc.buildout
 Recommends: libc6-dev | libc-dev,
             gcc | c-compiler,
             g++ | c++-compiler,