From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 3 Oct 2017 11:45:15 +0000 (+0100)
Subject: Merge version 2.1.1-6+rpi1 and 2.1.1-7 to produce 2.1.1-7+rpi1
X-Git-Tag: archive/raspbian/2.1.1-7+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=073225519205643810610ebcaa0dde33d0846352;p=openmpi.git

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

073225519205643810610ebcaa0dde33d0846352
diff --cc debian/changelog
index a7948601,1163e027..85b9c998
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,22 @@@
- openmpi (2.1.1-6+rpi1) buster-staging; urgency=medium
++openmpi (2.1.1-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
 +  * replace dmb with MCR p15, 0, r0, c7, c10, 5 in opal/asm/base/ARM.asm
 +    as suggested at http://www.open-mpi.org/community/lists/devel/2012/02/10626.php
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 05 Jul 2017 00:52:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Oct 2017 11:45:15 +0000
++
+ openmpi (2.1.1-7) unstable; urgency=medium
+ 
+   * Standards-Version: 4.1.0; no changes required
+   * Add multistage support to make bootstrappable. Closes: #871243
+   * Typos in package names in rules: openpi -> openmpi. Closes: #876911
+   * Move to debhelper level 10; remove dependencies on automake, 
+     autoconf, autotools-dev, libtool
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 27 Sep 2017 13:33:11 +0100
  
  openmpi (2.1.1-6) unstable; urgency=medium