From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 11 Feb 2019 14:49:40 +0000 (+0000)
Subject: Merge version 1.11.12-1+rpi1 and 1.11.12-3 to produce 1.11.12-3+rpi1
X-Git-Tag: archive/raspbian/1.11.12-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bab640254f743c21760a87182c9f7053700700ee;p=hwloc.git

Merge version 1.11.12-1+rpi1 and 1.11.12-3 to produce 1.11.12-3+rpi1
---

eac4f180b0346f5defdcabfb0c07caebc1a4e424
diff --cc debian/changelog
index 968fac1,44a328d..d32d278
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- hwloc (1.11.12-1+rpi1) buster-staging; urgency=medium
++hwloc (1.11.12-3+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, 20 Dec 2018 06:10:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Feb 2019 14:49:40 +0000
++
+ hwloc (1.11.12-3) unstable; urgency=medium
+ 
+   * watch: Add.
+   * patches/doc-nopdf: Disable building pdf version of documentation.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Sat, 09 Feb 2019 00:38:46 +0100
  
  hwloc (1.11.12-1) unstable; urgency=medium