From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 18 Sep 2018 12:56:40 +0000 (+0100)
Subject: Merge version 1.11.10-3+rpi1 and 1.11.11-1 to produce 1.11.11-1+rpi1
X-Git-Tag: archive/raspbian/1.11.11-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=079ca43204e970c85d822edf38e8e346e22c88f4;p=hwloc.git

Merge version 1.11.10-3+rpi1 and 1.11.11-1 to produce 1.11.11-1+rpi1
---

079ca43204e970c85d822edf38e8e346e22c88f4
diff --cc debian/changelog
index f317181,73513df..64c4577
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- hwloc (1.11.10-3+rpi1) buster-staging; urgency=medium
++hwloc (1.11.11-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.11.8-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Sep 2017 01:56:00 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jul 2018 15:58:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Sep 2018 12:56:40 +0000
++
+ hwloc (1.11.11-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - patches/test-xml: Remove patch, merged upstream.
+   * control: Bump Standards-Version to 4.2.0 (no changes).
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Wed, 05 Sep 2018 16:12:21 +0200
  
  hwloc (1.11.10-3) unstable; urgency=medium