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

diff --cc debian/changelog
index 6e7b3fc12c7adf9c3960c90bfcfdc7c11c4975a9,e37f33cb4c36251c951f08bfc5744e5226457a33..db19e1b19fcfea6041f426f727394bb2bee6ffcd
--- 1/debian/changelog
--- 2/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 8a85bc19bfd02541b2099ff9fa3247e1d87dbf17,77288979dd067feca074386523091eab49c578e8..4da8366ce01df77d64d601d27b635810fba046c9
--- 1/debian/patches/series
--- 2/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

diff --cc debian/rules
Simple merge