[Python-modules-commits] r21198 - in packages/pytest/trunk/debian (changelog control)

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

    Date: Friday, April 13, 2012 @ 15:46:36
  Author: laarmen-guest
Revision: 21198

Add a Build-conflict on python-pytest-xdist << 1.5

Modified:
  packages/pytest/trunk/debian/changelog
  packages/pytest/trunk/debian/control

Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog	2012-04-13 14:54:02 UTC (rev 21197)
+++ packages/pytest/trunk/debian/changelog	2012-04-13 15:46:36 UTC (rev 21198)
@@ -5,6 +5,7 @@
   * Enable test suite
     + Uncomment the override_dh_auto_test target
     + Add python-pytest and python3-pytest in Build-Depends
+  * Build-Conflicts on old versions of python-pytest-xdist (<< 1.5) 
 
  -- Simon Chopin <chopin.simon at gmail.com>  Fri, 13 Apr 2012 15:45:43 +0200
 

Modified: packages/pytest/trunk/debian/control
===================================================================
--- packages/pytest/trunk/debian/control	2012-04-13 14:54:02 UTC (rev 21197)
+++ packages/pytest/trunk/debian/control	2012-04-13 15:46:36 UTC (rev 21198)
@@ -14,6 +14,7 @@
  python3-py,
  python3-pytest,
  python3-setuptools
+Build-Conflicts: python-pytest-xdist (<< 1.5)
 X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.0
 Standards-Version: 3.9.3