From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 20 Dec 2018 06:10:05 +0000 (+0000)
Subject: Merge version 1.11.11-2+rpi1 and 1.11.12-1 to produce 1.11.12-1+rpi1
X-Git-Tag: raspbian/1.11.12-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98f206677bd3383a1ca748967e3f0c3f15ef1f5d;p=hwloc.git

Merge version 1.11.11-2+rpi1 and 1.11.12-1 to produce 1.11.12-1+rpi1
---

803c5858421ac1694b1423a419c101c944ecde72
diff --cc debian/changelog
index b98ab32,ddbffe6..968fac1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- hwloc (1.11.11-2+rpi1) buster-staging; urgency=medium
++hwloc (1.11.12-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, 27 Sep 2018 14:41:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Dec 2018 06:10:04 +0000
++
+ hwloc (1.11.12-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Fri, 14 Dec 2018 16:19:49 +0100
  
  hwloc (1.11.11-2) unstable; urgency=medium