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

diff --cc debian/changelog
index 94345a42e55a29c500034998a17bbc7134420cb0,b70743b9dd8a84b9e4d3909dd597a5954fa4f736..91a3011c8d394a7d8248c8931b79ebd1cb4597c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- openmpi (3.1.2-3+rpi1) buster-staging; urgency=medium
++openmpi (3.1.2-4+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>  Tue, 18 Sep 2018 11:29:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 23 Sep 2018 15:56:13 +0000
++
+ openmpi (3.1.2-4) unstable; urgency=medium
+ 
+   * Reccomend  libopencoarrays-openmpi-dev, (and drop opencoarrays-bin), now
+     that coarrays pkg split to openmpi, mpich parts
+   * Sanitize build paths from opal_config.h
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 18 Sep 2018 07:10:44 +0100
  
  openmpi (3.1.2-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge