From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 13 Sep 2018 18:27:30 +0000 (+0100)
Subject: Merge version 3.1.1.real-7+rpi1 and 3.1.2-1 to produce 3.1.2-1+rpi1
X-Git-Tag: archive/raspbian/3.1.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3eb3ee325dba9b2ff1d2cfb9b8fa1abba23f9314;p=openmpi.git

Merge version 3.1.1.real-7+rpi1 and 3.1.2-1 to produce 3.1.2-1+rpi1
---

3eb3ee325dba9b2ff1d2cfb9b8fa1abba23f9314
diff --cc debian/changelog
index 6e7b3fc1,e37f33cb..db19e1b1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,24 @@@
- openmpi (3.1.1.real-7+rpi1) buster-staging; urgency=medium
++openmpi (3.1.2-1+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>  Sat, 25 Aug 2018 17:48:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Sep 2018 18:27:29 +0000
++
+ openmpi (3.1.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+    - library changes:
+      libmpi_mpifh.so.40.10.1 -> libmpi_mpifh.so.40.10.2
+      libmpi.so.40.10.1 -> libmpi.so.40.10.2
+      libopen-pal.so.40.10.1 -> libopen-pal.so.40.10.2
+      libopen-rte.so.40.10.1 -> libopen-rte.so.40.10.2
+    - hang-fix patch merged upstream
+   * Re-enable use of external libpix, libevent
+   * Add Recommends: on open-coarrays (dev and bin packages)
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 28 Aug 2018 19:07:54 +0100
  
  openmpi (3.1.1.real-7) unstable; urgency=medium
  
diff --cc debian/patches/series
index 8a85bc19,77288979..4da8366c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -9,5 -9,3 +9,4 @@@ verbose-ompi-rules.patc
  openjdk10.patch
  fix-underlinking.patch
  # force-pmix-3.patch
- hang-fix.patch
 +raspbian.diff