Merge version 2021.11.0-2+rpi1 and 2021.12.0-1 to produce 2021.12.0-1+rpi1

diff --cc debian/changelog
index 067ae6a6c476b22eea14334056a1939d193c7521,8d0a253a27141816e93267d9aaf53a6a3ecdecb1..80b50fcfae8ac167df1296f5bcbf766cff946b8f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,31 +1,42 @@@
- onetbb (2021.11.0-2+rpi1) trixie-staging; urgency=medium
++onetbb (2021.12.0-1+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>  Sun, 07 Jan 2024 04:59:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 26 Jul 2024 22:48:32 +0000
++
+ onetbb (2021.12.0-1) unstable; urgency=medium
+ 
+   [ zhangdandan ]
+   * Fix testcases failed on loong64 (Closes: #1070849)
+ 
+   [ Mo Zhou ]
+   * Upload to unstable.
+ 
+  -- Mo Zhou <lumin@debian.org>  Fri, 12 Jul 2024 01:16:04 -0400
+ 
+ onetbb (2021.12.0-1~exp1) experimental; urgency=medium
+ 
+   [ Gianfranco Costamagna ] (Ubuntu changes)
+   * Fix build on ppc64el by using -Wno-error=stringop-overflow.
+   * Make sure FORTIFY_SOURCE=3 is used, to fix FTBFS due to mixing
+     different values of them
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Add sh4 architecture support.
+ 
+   [ Mo Zhou ]
+   * New upstream version 2021.12.0
+   * Quilt refresh patches.
+   * B-D on pkgconf instead of pkg-config.
+   * ubuntu fortify patch is not necessary here on debian
+   * Upload to experimental.
+ 
+  -- Mo Zhou <lumin@debian.org>  Thu, 25 Apr 2024 14:19:08 -0400
  
  onetbb (2021.11.0-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge