From fccb0e2bd6883ff49e68858da4598c793c3a092a Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sun, 25 Sep 2022 18:32:36 +0000 Subject: [PATCH] remove hwloc build-conflicts, the package build-depends on hwloc now. --- debian/changelog | 5 +---- debian/control | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b9ab895..c511d60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,9 @@ onetbb (2021.5.0-15+rpi1) bookworm-staging; urgency=medium [changes brought forward from 2021.5.0-12+rpi1 by Peter Michael Green at Fri, 01 Jul 2022 09:58:06 +0000] * Link against libatomic on armhf too. - * Add build-conflicts on libhwloc15, hwloc-nox and hwloc - if some hwloc components (not sure exactly which) are - present, the build fails due to extra files. * Fix clean target. - -- Raspbian forward porter Sat, 24 Sep 2022 19:26:29 +0000 + -- Peter Michael Green Sun, 25 Sep 2022 18:31:37 +0000 onetbb (2021.5.0-15) unstable; urgency=medium diff --git a/debian/control b/debian/control index bea41d3..81ee567 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper-compat (= 13), ninja-build, python3-sphinx , python3-sphinx-book-theme , -Build-Conflicts: libhwloc15, hwloc, hwloc-nox Build-Depends-Indep: doxygen, graphviz, Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/science-team/tbb -- 2.30.2