From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Jun 2020 23:43:52 +0000 (+0100)
Subject: Merge version 4.0.3-6+rpi1 and 4.0.3-8 to produce 4.0.3-8+rpi1
X-Git-Tag: archive/raspbian/4.0.3-8+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=66db16546586a959c7c0517365c0ad4239d62089;p=openmpi.git

Merge version 4.0.3-6+rpi1 and 4.0.3-8 to produce 4.0.3-8+rpi1
---

66db16546586a959c7c0517365c0ad4239d62089
diff --cc debian/changelog
index b9a8d780,78270b32..2802c965
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- openmpi (4.0.3-6+rpi1) bullseye-staging; urgency=medium
++openmpi (4.0.3-8+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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 18 Apr 2020 19:54:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jun 2020 23:43:52 +0000
++
+ openmpi (4.0.3-8) unstable; urgency=medium
+ 
+   * Undo 64-bit; 
+   * Add breaks to avoid libhwloc.so.5/so.15 collision. Closes: #961631
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 28 May 2020 16:35:04 +0100
+ 
+ openmpi (4.0.3-7) experimental; urgency=medium
+ 
+   * Experimental full 64-bit build
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 20 May 2020 12:12:06 +0100
  
  openmpi (4.0.3-6) unstable; urgency=medium
  
diff --cc debian/patches/series
index fbb6b7d7,2cb9498d..0da1c896
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -7,6 -7,5 +7,6 @@@ hppa.patc
  opal_fifo.patch
  verbose-ompi-rules.patch
  fix-underlinking.patch
- # version-script.patch
+ #version-script.patch
  no-warning-unused.patch
 +raspbian.diff