Merge version 2021.5.0-12+rpi1 and 2021.5.0-15 to produce 2021.5.0-15+rpi1

diff --cc debian/changelog
index b61d9ffbf77bfcc18b7c9bd04bbf3d65b7e13da8,dd6d0db1083444dd0bdff0784727f2b3248447dd..b9ab895642dabf17a3463788b0ab56273361e8a4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,35 @@@
- onetbb (2021.5.0-12+rpi1) bookworm-staging; urgency=medium
++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.
 +  * Add build-conflicts on libhwloc15, hwloc-nox and hwloc
 +    if some hwloc components (not sure exactly which) are
 +    present, the build fails due to extra files.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 01 Jul 2022 09:58:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 24 Sep 2022 19:26:29 +0000
++
+ onetbb (2021.5.0-15) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Mo Zhou <lumin@debian.org>  Wed, 07 Sep 2022 14:45:46 -0400
+ 
+ onetbb (2021.5.0-14) experimental; urgency=medium
+ 
+   * Enable hwloc support as per upstream request.
+     + Install the new libtbbbind_*.so after enabling hwloc.
+     + Install the new shared object in separate binary package.
+   * Switch linker from bfd to gold for ppc64el.
+     This bypasses a regression (linker segmentation fault) in binutils.
+ 
+  -- Mo Zhou <lumin@debian.org>  Tue, 06 Sep 2022 23:53:16 -0400
+ 
+ onetbb (2021.5.0-13) unstable; urgency=medium
+ 
+   * Suppress compiler warnings appeared since GCC-12. (Closes: #1016283)
+ 
+  -- Mo Zhou <lumin@debian.org>  Thu, 18 Aug 2022 12:57:20 -0400
  
  onetbb (2021.5.0-12) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge