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

diff --cc debian/changelog
index b87706abb320064c300a5c06a6c802f3d9c95fd4,0b0d1670cf69df33f4d109e52b17c62df1b9def4..0818edc3d9371b544b56c32672446085314641ca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- openmpi (4.1.2~rc1-4+rpi1) bookworm-staging; urgency=medium
++openmpi (4.1.2~rc1-5+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>  Mon, 11 Oct 2021 13:45:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Nov 2021 23:13:56 +0000
++
+ openmpi (4.1.2~rc1-5) unstable; urgency=medium
+ 
+   * Drop unused and broken link to libopen-orted-mpir.so
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 27 Oct 2021 09:08:51 +0100
  
  openmpi (4.1.2~rc1-4) unstable; urgency=medium