From: Raspbian forward pporter <root@raspbian.org>
Date: Sat, 10 Feb 2018 10:35:25 +0000 (+0000)
Subject: Merge version 2.1.1-7+rpi1 and 2.1.1-8 to produce 2.1.1-8+rpi1
X-Git-Tag: archive/raspbian/2.1.1-8+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=92d863a4acc2ca5956e44ec468c4ad6812e53595;p=openmpi.git

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

92d863a4acc2ca5956e44ec468c4ad6812e53595
diff --cc debian/changelog
index 85b9c998,745c49a9..2cf6011f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- openmpi (2.1.1-7+rpi1) buster-staging; urgency=medium
++openmpi (2.1.1-8+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Oct 2017 11:45:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 10 Feb 2018 10:35:25 +0000
++
+ openmpi (2.1.1-8) unstable; urgency=medium
+ 
+   * Remove obsolete dependency on libcr-dev. Closes: #877009
+   * Disable Java on ia64. Closes: 888286
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 05 Feb 2018 09:06:53 +0000
  
  openmpi (2.1.1-7) unstable; urgency=medium