Merge version 3.1.3-3+rpi1 and 3.1.3-9 to produce 3.1.3-9+rpi1

diff --cc debian/changelog
index 06ae2398a21434ec0cc283323b5d6ada0ba75885,d8abc78a871ff8f46ec8a0b95806f5f94a23971e..f6ee1f78925edba95fc0f6cf722772e69fc0c04c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,48 +1,56 @@@
- openmpi (3.1.3-3+rpi1) buster-staging; urgency=medium
++openmpi (3.1.3-9+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, 04 Dec 2018 18:17:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 15 Jan 2019 10:15:41 +0000
++
+ openmpi (3.1.3-9) unstable; urgency=medium
+ 
+   * Re-enable external pmix now that it works with 32-bit systems again.
+     Closes: #918713.
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 08 Jan 2019 19:20:33 +0000
+ 
+ openmpi (3.1.3-8) unstable; urgency=medium
+ 
+   * dh-fortran-mod >= 0.11 to properly remove files on purge.
+     Closes: #918000, #915025.
+   * Use internal pmix until pmix pkg works.
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 07 Jan 2019 21:19:05 +0000
+ 
+ openmpi (3.1.3-7) unstable; urgency=medium
+ 
+   * Standards-Version: 4.3.0
+   * Use dh-fortran-mod and place mod files in $fmoddir/openmpi to avoid
+     collision with mpich. Closes: #917133
+   * Patch to remove PMIX_MODEX (removed in latest pmix release)
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 01 Jan 2019 13:25:39 +0000
+ 
+ openmpi (3.1.3-6) unstable; urgency=medium
+ 
+   * Rebuild with dh-fortran-mod >= 0.6 to fix broken postrm script.
+     Closes: #916890
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 20 Dec 2018 09:23:45 +0000
+ 
+ openmpi (3.1.3-5) unstable; urgency=medium
+ 
+   * Use dh-fortran-mod >= 0.4: insert tracking via Fortran-Mod rather than
+     Depends. mod file is now placed in /usr/lib/$arch/fortran/gfortran-8
+     ($fmoddir) but also in usual place until gfortan reads $fmoddirOA
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 11 Dec 2018 14:14:53 +0000
+ 
+ openmpi (3.1.3-4) unstable; urgency=medium
+ 
+   * More robust altertnatives handling. Closes: #915025
+   * Don't call dpkg-parsechangelog in rules
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Fri, 07 Dec 2018 13:04:38 +0000
  
  openmpi (3.1.3-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 4cbc1f5ff114cdddfc9c520d133350e13e000592,0f3380bac562ed696ccb867a1c51f401a35759f0..bb47cf0db5784b9bbefec97b9b536eb5638a1436
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -7,4 -7,4 +7,5 @@@ opal_fifo.patc
  verbose-ompi-rules.patch
  openjdk10.patch
  fix-underlinking.patch
+ pmix-modex.patch
 +raspbian.diff

diff --cc debian/rules
Simple merge