[Python-modules-commits] [pytest-mock] 04/07: d/control: Build-Conflicts on python3-mock

[Vincent Bernat]

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

bernat pushed a commit to branch debian/master
in repository pytest-mock.

commit d3020ab33cbe4317445c962e53e0e0d30ed50b87
Author: Vincent Bernat <vincent at bernat.im>
Date:   Mon Sep 18 19:27:51 2017 +0200

    d/control: Build-Conflicts on python3-mock
---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8abb790..f648197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pytest-mock (1.6.3-1) UNRELEASED; urgency=medium
 
   * New upstream release. Closes: #872618.
     + Fix FTBFS due to deprecated use of mock fixture. Closes: #871127.
+  * d/control: Build-Conflicts on python3-mock as tests are expecting it
+    to be absent.
 
  -- Vincent Bernat <bernat at debian.org>  Mon, 18 Sep 2017 19:14:32 +0200
 
diff --git a/debian/control b/debian/control
index fcebcd6..b214f79 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 9), dh-python,
                python3-all,
                python3-pytest,
                python3-setuptools,
-               python3-setuptools-scm,
-               python3-mock
+               python3-setuptools-scm
+Build-Conflicts: python3-mock
 Standards-Version: 3.9.8
 Homepage: https://github.com/pytest-dev/pytest-mock/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pytest-mock.git

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