diff -Nru onetbb-2021.5.0/debian/changelog onetbb-2021.5.0/debian/changelog
--- onetbb-2021.5.0/debian/changelog	2022-06-25 14:28:41.000000000 +0000
+++ onetbb-2021.5.0/debian/changelog	2022-07-01 09:58:06.000000000 +0000
@@ -1,3 +1,13 @@
+onetbb (2021.5.0-12+rpi1) bookworm-staging; urgency=medium
+
+  * 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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 01 Jul 2022 09:58:06 +0000
+
 onetbb (2021.5.0-12) unstable; urgency=medium
 
   [ Adrian Bunk ]
diff -Nru onetbb-2021.5.0/debian/control onetbb-2021.5.0/debian/control
--- onetbb-2021.5.0/debian/control	2022-06-25 14:28:06.000000000 +0000
+++ onetbb-2021.5.0/debian/control	2022-07-01 09:58:06.000000000 +0000
@@ -12,6 +12,7 @@
                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
diff -Nru onetbb-2021.5.0/debian/rules onetbb-2021.5.0/debian/rules
--- onetbb-2021.5.0/debian/rules	2022-06-21 15:27:04.000000000 +0000
+++ onetbb-2021.5.0/debian/rules	2022-07-01 09:58:06.000000000 +0000
@@ -18,7 +18,7 @@
 endif
 
 # explicitly link against libatomic
-ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel m68k sh4 powerpc))
+ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf mipsel m68k sh4 powerpc))
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
@@ -69,3 +69,6 @@
 # Makefiles should not be compressed (tbb-examples)
 override_dh_compress-indep:
 	dh_compress -X*/examples/*
+
+execute_after_dh_auto_clean:
+	rm -rf html