remove hwloc build-conflicts, the package build-depends on hwloc now.

diff --git a/debian/changelog b/debian/changelog
index b9ab895642dabf17a3463788b0ab56273361e8a4..c511d6042bf36f30f78cf7d693e00d9083109f39 100644 (file)
--- 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 <plugwash@raspbian.org> 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 <root@raspbian.org>  Sat, 24 Sep 2022 19:26:29 +0000
+ -- Peter Michael Green <plugwash@raspbian.org>  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 bea41d36084f7a13dd7497a2e70406cccff9b14c..81ee56799fc15316fa01ac20fa3fb55799f59b76 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper-compat (= 13),
                ninja-build,
                python3-sphinx <!nodoc>,
                python3-sphinx-book-theme <!nodoc>,
-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