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

diff --cc debian/changelog
index 170a885da8c2aec5b1b875e08125dd8845285ff1,f833a754b9ab13421a081a12f69fcc7b043724b6..c71a72ead5d175ff926ccd30a7869c1d491ea241
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,21 +1,32 @@@
- onetbb (2021.8.0-2+rpi1) bookworm-staging; urgency=medium
++onetbb (2021.9.0-2+rpi1) trixie-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>  Sat, 03 Jun 2023 05:32:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Sep 2023 23:30:09 +0000
++
+ onetbb (2021.9.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   * Added patch classiciation and added more metadata.
+   * Avoid build problem on armel caused by strange compiler
+     (Closes: #1042009).
+ 
+  -- Petter Reinholdtsen <pere@debian.org>  Wed, 02 Aug 2023 22:42:54 +0200
+ 
+ onetbb (2021.9.0-1) unstable; urgency=medium
+ 
+   * New upstream version 2021.9.0
+   * Remove merged patches.
+   * Remove merged patches. Rebase remaining ones.
+   * Add patch for missing header to resolve FTBFS. (Closes: #1037798)
+ 
+  -- Mo Zhou <lumin@debian.org>  Thu, 13 Jul 2023 21:29:44 -0700
  
  onetbb (2021.8.0-2) unstable; urgency=medium