From ec190b79bd8af9bdb1e9c2bc4b9ff43dea6fad0c Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 11 Jul 2019 00:50:29 +0000 Subject: [PATCH] Add build conflicts on python3-sphinx --- debian/changelog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4d0ab4e96..27568f096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,10 @@ llvm-toolchain-8 (1:8-3+rpi1) buster-staging; urgency=medium [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] * Change triplet in debian/rules to use armv6k rather than armv7l + [changes introduced in llvm-toolchain-8 1:8-3+rpi1 by Peter Michael Green] + * Add build-conflicts on python3-sphinx, if it's installed the build tries + to use it and finds missing extensions. + -- Peter Michael Green Thu, 18 Apr 2019 12:39:00 +0000 llvm-toolchain-8 (1:8-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 3c2eeeb84..c95620f17 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x], libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], -Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev, python3-sphinx Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 8 -- 2.30.2