[Python-modules-commits] [vine] 08/09: Force use of python3-sphinx by build conflicting on python-sphinx

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository vine.

commit 139296f147cc4e6e36e41a7ac0286a68bbacd8eb
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Fri Oct 27 20:09:08 2017 +0100

    Force use of python3-sphinx by build conflicting on python-sphinx
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2bad5e1..5f78e49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ vine (1.1.4+dfsg-1) UNRELEASED; urgency=medium
   * Add new signing key https://github.com/celery/kombu/issues/773 
   * New upstream release (1.1.4) 
   * Use secure uri in debian/watch
+  * Force use of python3-sphinx by build conflicting on python-sphinx
 
  -- Christopher Hoskin <mans0954 at debian.org>  Fri, 27 Oct 2017 19:56:46 +0100
 
diff --git a/debian/control b/debian/control
index 4699fc6..240413d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Priority: optional
 Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9),
  python3-sphinx, python3-sphinx-celery, python3-pytest, python3-case,
  python-all, python-setuptools, python-pytest, python-case
+Build-Conflicts: python-sphinx
 Standards-Version: 3.9.8
 Homepage: http://github.com/celery/vine
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/vine.git

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