From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 14 Oct 2018 08:34:50 +0000 (+0100)
Subject: Merge version 3.1.2-4+rpi1 and 3.1.2-6 to produce 3.1.2-6+rpi1
X-Git-Tag: archive/raspbian/3.1.2-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=feefcd6b9dfbef179018751bd4b5e7785243a70f;p=openmpi.git

Merge version 3.1.2-4+rpi1 and 3.1.2-6 to produce 3.1.2-6+rpi1
---

feefcd6b9dfbef179018751bd4b5e7785243a70f
diff --cc debian/changelog
index 91a3011c,68847401..14de3cb2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,18 +1,26 @@@
- openmpi (3.1.2-4+rpi1) buster-staging; urgency=medium
++openmpi (3.1.2-6+rpi1) buster-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, 23 Sep 2018 15:56:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 14 Oct 2018 08:34:49 +0000
++
+ openmpi (3.1.2-6) unstable; urgency=medium
+ 
+   * Fixes for regression (segfaults in liggghts, etc) due to btl patch.
+     Closes: #905418, #910263
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 08 Oct 2018 11:44:08 +0100
+ 
+ openmpi (3.1.2-5) unstable; urgency=medium
+ 
+   * Fx by Nathan Hjelm for hangs on archs with 32-bit atomics tags
+     Closes: #905418, #907267, #907407
+   * make openmpi-bin depend on libopenmpi-dev, as its needed for mpicc,etc.
+   * Drop link-libfabric.patch as obsolete
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 03 Oct 2018 13:15:03 +0100
  
  openmpi (3.1.2-4) unstable; urgency=medium
  
diff --cc debian/patches/series
index 4da8366c,8d94354f..d91658e4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -8,5 -7,4 +7,5 @@@ opal_fifo.patc
  verbose-ompi-rules.patch
  openjdk10.patch
  fix-underlinking.patch
- # force-pmix-3.patch
+ btl.patch
 +raspbian.diff