From d68d0619fba08979f00d7a256850c1fa74fc97be Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 25 Oct 2018 14:03:20 +0100 Subject: [PATCH] Remove ocaml build-conflicts introduced in 1:6.0-3+rpi1, debian is building with ocmal support again. --- debian/changelog | 3 --- debian/control | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7aa42a9a..4e295c321 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,9 +21,6 @@ llvm-toolchain-7 (1:7-6+rpi1) buster-staging; urgency=medium * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain about it not existing. * clean up more crap left behind by build process. - * Put commented out (by Debian not us) ocaml build-depends into build-conflicts - if they are installed it seems that the package builds the ocaml stuff and - then errors out during packaging because it's not installed to anywhere. [changes introduced in 1:6.0-3+rpi1 by Peter Michael Green] * Remove debian/man in clean target. diff --git a/debian/control b/debian/control index cc5a36528..c20b608cb 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,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, ocaml-nox, ocaml-findlib, libctypes-ocaml-dev, dh-ocaml +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 7 -- 2.30.2