Merge version 3.1.2-6+rpi1 and 3.1.3-2 to produce 3.1.3-2+rpi1

diff --cc config/opal_config_asm.m4
Simple merge

diff --cc debian/changelog
index 14de3cb2f134d54868998cee7cd6614be283843c,159fe7f8337aa2073b4a22e3e51ba493668ba522..d8f18bfe55f2eb43578a0e6b63d21fa7daad0244
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,42 +1,50 @@@
- openmpi (3.1.2-6+rpi1) buster-staging; urgency=medium
++openmpi (3.1.3-2+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, 14 Oct 2018 08:34:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Nov 2018 03:36:46 +0000
++
+ openmpi (3.1.3-2) unstable; urgency=medium
+ 
+   * Check if mpi alternatives is corrupt. If so, delete. Closes: #912437
+   * openmpi-dev.postinst: don't call update-alt on abort
+   * openmpi-bin.postinst: silence grep output on check
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 31 Oct 2018 17:12:52 +0000
+ 
+ openmpi (3.1.3-1) unstable; urgency=medium
+ 
+   * New upstream release Closes: #902101 
+   * Drop alioth mailing list (OpenMPI maintainers) from Uploaders.
+     Closes: #899289.
+   * Openmpi-bin is not labelled M-A: foreign. Closes: #901874
+   * preinst, postinst scripts: recast conditionals to allow 'set -e'
+   * Add Recommends: libopenmpi-dev to openmpi-bin
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 30 Oct 2018 16:14:16 +0000
+ 
+ openmpi (3.1.3~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Build against libpmix 3.1.0rc1
+   * Drop hard-coded xz compression for tarball
+   * btl.patch now merged upstream.
+   * library soname changes:
+     libmpi 40.10.2 -> 40.10.3
+     libopen-pal 40.10.2 -> 40.10.3
+     libopen-rte 40.10.2 -> 40.10.3
+     libmpi_usempif08. 40.10.1 -> 40.10.2
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 24 Oct 2018 16:49:41 +0100
+ 
+ openmpi (3.1.2-7) experimental; urgency=medium
+ 
+   * Test builtin atomics on riscv64
+   * Compile with gcc-7 on ia64 (ICE on gcc8*)
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 17 Oct 2018 12:08:52 +0100
  
  openmpi (3.1.2-6) unstable; urgency=medium
  

diff --cc debian/patches/series
index d91658e4c6a233647312cb45cf54e7f2d9ce8af9,8ba2aa4241e62403d6c6918128fa4fdedacfd33e..4cbc1f5ff114cdddfc9c520d133350e13e000592
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -7,5 -7,3 +7,4 @@@ opal_fifo.patc
  verbose-ompi-rules.patch
  openjdk10.patch
  fix-underlinking.patch
- btl.patch
 +raspbian.diff

diff --cc debian/rules
Simple merge