[Python-modules-commits] r29023 - in packages/python-repoze.what/trunk/debian (2 files)

[zigo at users.alioth.debian.org]

    Date: Thursday, May 22, 2014 @ 01:18:02
  Author: zigo
Revision: 29023

Package build-conflicts with itself to avoid FTBFS with unit tests.

Modified:
  packages/python-repoze.what/trunk/debian/changelog
  packages/python-repoze.what/trunk/debian/control

Modified: packages/python-repoze.what/trunk/debian/changelog
===================================================================
--- packages/python-repoze.what/trunk/debian/changelog	2014-05-22 01:17:58 UTC (rev 29022)
+++ packages/python-repoze.what/trunk/debian/changelog	2014-05-22 01:18:02 UTC (rev 29023)
@@ -10,6 +10,7 @@
   * Patches docs/source/conf.py to stop using intersphinx.
   * rm -f /usr/lib/python2*/dist-packages/repoze.what-*-nspkg.pth
     (Closes: #746023).
+  * Package build-conflicts with itself to avoid FTBFS with unit tests.
 
  -- Thomas Goirand <zigo at debian.org>  Wed, 21 May 2014 23:09:11 +0000
 

Modified: packages/python-repoze.what/trunk/debian/control
===================================================================
--- packages/python-repoze.what/trunk/debian/control	2014-05-22 01:17:58 UTC (rev 29022)
+++ packages/python-repoze.what/trunk/debian/control	2014-05-22 01:18:02 UTC (rev 29023)
@@ -14,6 +14,7 @@
                python-setuptools,
                python-sphinx,
                python-zope.interface
+Build-Conflicts: python-repoze.what
 Standards-Version: 3.8.4
 Homepage: http://www.repoze.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-repoze.what/trunk/