From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 4 Jul 2020 02:50:34 +0000 (+0100)
Subject: Merge version 4.0.3-9+rpi1 and 4.0.4-1 to produce 4.0.4-1+rpi1
X-Git-Tag: archive/raspbian/4.0.4-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b06bb6d70f660d1447fdde5d4cecad5bcf723c4c;p=openmpi.git

Merge version 4.0.3-9+rpi1 and 4.0.4-1 to produce 4.0.4-1+rpi1
---

b06bb6d70f660d1447fdde5d4cecad5bcf723c4c
diff --cc debian/changelog
index 085d4e97,292b9b2f..9d259a53
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- openmpi (4.0.3-9+rpi1) bullseye-staging; urgency=medium
++openmpi (4.0.4-1+rpi1) bullseye-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>  Thu, 18 Jun 2020 15:01:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 04 Jul 2020 02:50:33 +0000
++
+ openmpi (4.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update libversions:
+     libmpi.so 40.20.3 -> 40.20.4
+     libopen-pal.so 40.20.3 -> 40.20.4
+     libopen-rte.so 40.20.3 -> 40.20.4
+     libmpi_usempif08: 40.21.0 -> 40.21.1
+   * Updated build config for ia64, thanks to John Paul Adrian Glaubitz.
+     Closes: #963729
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 02 Jul 2020 08:42:05 +0100
  
  openmpi (4.0.3-9) unstable; urgency=medium
  
diff --cc debian/patches/series
index 50b1f7a5,6599071e..2b929e80
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -10,4 -10,4 +10,5 @@@ fix-underlinking.patc
  #version-script.patch
  no-warning-unused.patch
  use-openib.patch
+ ia64.patch
 +raspbian.diff