From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 20 Jun 2018 18:27:05 +0000 (+0100)
Subject: Merge version 3.1.0-6+rpi1 and 3.1.0-7 to produce 3.1.0-7+rpi1
X-Git-Tag: archive/raspbian/3.1.0-7+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8659ed27db8834d042486341b9bec94f51f27a09;p=openmpi.git

Merge version 3.1.0-6+rpi1 and 3.1.0-7 to produce 3.1.0-7+rpi1
---

8659ed27db8834d042486341b9bec94f51f27a09
diff --cc debian/changelog
index 97f8cb52,10529a0a..a079fb71
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- openmpi (3.1.0-6+rpi1) buster-staging; urgency=medium
++openmpi (3.1.0-7+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, 03 Jun 2018 23:43:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 18:27:04 +0000
++
+ openmpi (3.1.0-7) unstable; urgency=medium
+ 
+   * Enable libpsm2.  Closes: #901132
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sat, 09 Jun 2018 13:36:15 +0100
  
  openmpi (3.1.0-6) unstable; urgency=medium