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

diff --cc debian/changelog
index 968fac10935d86b2d68ccf7762a3451c92543a16,44a328da6f3f043b2719262c7895a5d964906dbf..d32d278d82270c327e3b63d84a3bd32d1c83c30f
--- 1/debian/changelog
--- 2/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