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

diff --cc debian/changelog
index d8f18bfe55f2eb43578a0e6b63d21fa7daad0244,0254802657fa36f9f0e7b79c0a2564dad557362a..06ae2398a21434ec0cc283323b5d6ada0ba75885
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- openmpi (3.1.3-2+rpi1) buster-staging; urgency=medium
++openmpi (3.1.3-3+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>  Thu, 08 Nov 2018 03:36:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 04 Dec 2018 18:17:21 +0000
++
+ openmpi (3.1.3-3) unstable; urgency=medium
+ 
+   * Use dh-fortran-mod to track Fortran module version
+   * Change symlink /usr/include/openmpi to /usr/include/$ma/openmpi
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 28 Nov 2018 17:08:03 +0000
  
  openmpi (3.1.3-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge