[liborcus] 01/01: add Build-Conflicts: python-sphinx to unconfuse sphinx-build

[Rene Engelhard]

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

rene pushed a commit to branch experimental
in repository liborcus.

commit 2ee7ebec31c049011ef553b12b9dac80c6928678
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Nov 18 20:57:42 2017 +0000

    add Build-Conflicts: python-sphinx to unconfuse sphinx-build
---
 debian/changelog | 2 +-
 debian/control   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b52d1f..8a0ad77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ liborcus (0.13.1-1) experimental; urgency=medium
 
   * New upstream version 0.13.1
 
- -- Rene Engelhard <rene at debian.org>  Sat, 18 Nov 2017 21:10:06 +0100
+ -- Rene Engelhard <rene at debian.org>  Sat, 18 Nov 2017 20:59:20 +0000
 
 liborcus (0.12.1-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2b46d03..bfd49a0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
 Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-iostreams-dev, libboost-program-options-dev, libboost-filesystem-dev, libmdds-dev (>= 1.2), chrpath, libixion-dev (>= 0.13.0~), python3-dev, sphinx-common
-Build-Depends-Indep: doxygen, python3-sphinx, python3-sphinx-bootstrap-theme,python3-breathe
+Build-Depends-Indep: doxygen, python3-sphinx, python3-sphinx-bootstrap-theme, python3-breathe
+Build-Conflicts: python-sphinx
 Standards-Version: 3.9.3
 Section: libs
 Homepage: https://gitlab.com/orcus/orcus

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/liborcus.git