[Python-modules-commits] [pytest] 01/02: Move twisted to Build-Conflicts until upstream issues #1989 is fixed

[Sebastian Ramacher]

This is an automated email from the git hooks/post-receive script.

sramacher pushed a commit to branch master
in repository pytest.

commit d182b34bf262c0d16c36ec94be0865840cbdf6db
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Nov 19 10:58:18 2016 +0100

    Move twisted to Build-Conflicts until upstream issues #1989 is fixed
---
 debian/control | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c2534c5..9f3f62b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,13 +20,14 @@ Build-Depends: debhelper (>= 9.20141010),
                python-py (>= 1.4.29),
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg),
-               python-twisted-core <!nocheck>,
                python3-all (>= 3.1.2-6~),
                python3-hypothesis <!nocheck>,
                python3-mock (>= 1.0.1) <!nocheck>,
                python3-nose <!nocheck>,
                python3-py (>= 1.4.29),
-               python3-setuptools,
+               python3-setuptools
+Build-Conflicts: python-twisted-core,
+                 python3-twisted-core
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.3
 Standards-Version: 3.9.8

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest.git