diff -Nru onetbb-2021.5.0/debian/changelog onetbb-2021.5.0/debian/changelog
--- onetbb-2021.5.0/debian/changelog	2022-09-07 18:45:46.000000000 +0000
+++ onetbb-2021.5.0/debian/changelog	2022-09-25 18:31:37.000000000 +0000
@@ -1,3 +1,14 @@
+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.
+  * Fix clean target.
+
+  [changes introduced in 2021.5.0-15+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 25 Sep 2022 18:31:37 +0000
+
 onetbb (2021.5.0-15) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru onetbb-2021.5.0/debian/rules onetbb-2021.5.0/debian/rules
--- onetbb-2021.5.0/debian/rules	2022-09-07 03:51:55.000000000 +0000
+++ onetbb-2021.5.0/debian/rules	2022-09-25 18:31:37.000000000 +0000
@@ -22,7 +22,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
 
@@ -64,6 +64,9 @@
 	# remove embedded javascripts. they will be provided by other system packages (see .links)
 	-$(RM) html/_static/*.js
 
+override_dh_auto_test:
+	echo testsuite disabled
+
 override_dh_auto_test-indep:
 	:
 
@@ -73,3 +76,6 @@
 # Makefiles should not be compressed (tbb-examples)
 override_dh_compress-indep:
 	dh_compress -X*/examples/*
+
+execute_after_dh_auto_clean:
+	rm -rf html