Merge version 4.1.2~rc1-5+rpi1 and 4.1.2-1 to produce 4.1.2-1+rpi1

diff --cc debian/changelog
index 0818edc3d9371b544b56c32672446085314641ca,b4d117bf88a653667ca8b985b6cfae8a94c98621..db159a040cf085c59b78b267f85575d3970eedca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- openmpi (4.1.2~rc1-5+rpi1) bookworm-staging; urgency=medium
++openmpi (4.1.2-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.1.1-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Jul 2017 00:52:53 +0000]
 +  * Modify arm "detection" for Raspbian.
 +  * Partially fix clean target
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Nov 2021 23:13:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 30 Nov 2021 18:03:17 +0000
++
+ openmpi (4.1.2-1) unstable; urgency=medium
+ 
+   * Nww upstream release
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 28 Nov 2021 08:20:25 +0000
  
  openmpi (4.1.2~rc1-5) unstable; urgency=medium