Merge version 2021.8.0-1+rpi1 and 2021.8.0-2 to produce 2021.8.0-2+rpi1

diff --cc debian/changelog
index 68b605e36e2cdbd905c3b5e7b18a7d33eccfc3c3,3adae56ef0e2a4cc1c9db40058c2a7f55cf809c9..170a885da8c2aec5b1b875e08125dd8845285ff1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,23 @@@
- onetbb (2021.8.0-1+rpi1) bookworm-staging; urgency=medium
++onetbb (2021.8.0-2+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 08 Jan 2023 21:26:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Jun 2023 05:32:35 +0000
++
+ onetbb (2021.8.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * libtbb12: Add explicit Breaks against libtbb2 for smoother upgrades from
+     bullseye. The the existing transitive Breaks via libtbbmalloc2 is not
+     sufficient for all upgrade paths.  (Closes: #1036073)
+   * Drop duplicate symbols.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Tue, 16 May 2023 12:23:01 +0200
  
  onetbb (2021.8.0-1) unstable; urgency=medium