Merge version 4.1.4-1+rpi1 and 4.1.4-2 to produce 4.1.4-2+rpi1

diff --cc debian/changelog
index 818e9b0aa959930d0a261c057be4f4557bc355c9,c3cce56025d70ce6762149356dcdba3dcb3211ce..20254a1da0f703fb2a04a6cd64a923b24a5adb52
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- openmpi (4.1.4-1+rpi1) bookworm-staging; urgency=medium
++openmpi (4.1.4-2+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>  Sun, 12 Jun 2022 12:25:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Oct 2022 07:39:54 +0000
++
+ openmpi (4.1.4-2) unstable; urgency=medium
+ 
+   * Fix broken oshmem symlink. Closes: #1009748
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sat, 03 Sep 2022 15:47:37 +0100
  
  openmpi (4.1.4-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge