Merge version 2021.12.0-1+rpi1 and 2022.0.0-1 to produce 2022.0.0-1+rpi1

diff --cc debian/changelog
index 80b50fcfae8ac167df1296f5bcbf766cff946b8f,5b6a277744f4b801118deb1000797bcdefd85a6b..58fb9c67d871bdfe122b990cd13f3d3e312fd40c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,28 +1,39 @@@
- onetbb (2021.12.0-1+rpi1) trixie-staging; urgency=medium
++onetbb (2022.0.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>  Fri, 26 Jul 2024 22:48:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jan 2025 20:49:30 +0000
++
+ onetbb (2022.0.0-1) unstable; urgency=medium
+ 
+   * Patch sphinx config file to fix the build (Closes: #1091039)
+   * Skip test_resumable_tasks to avoid FTBFS on s390x.
+   * Upload to unstable.
+ 
+  -- Mo Zhou <lumin@debian.org>  Wed, 01 Jan 2025 20:29:54 -0500
+ 
+ onetbb (2022.0.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 2022.0.0
+   * Refresh symbols control file.
+ 
+  -- Mo Zhou <lumin@debian.org>  Sat, 23 Nov 2024 20:45:19 -0500
+ 
+ onetbb (2021.13.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 2021.13.0
+   * Refresh existing patches.
+   * Switch from sphinx book theme to rtd theme due to pydata-sphinx-theme
+     (0.15.4+dfsg-1) being temporarily buggy where it missed necessary files.
+   * Remove unsupported C/CXXFLAGS for alpha and hppa architectures.
+   * Upload to experimental.
+ 
+  -- Mo Zhou <lumin@debian.org>  Thu, 17 Oct 2024 23:50:27 -0400
  
  onetbb (2021.12.0-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge