Merge version 2.1.0+dfsg-2+rpi1 and 2.1.0+dfsg-3 to produce 2.1.0+dfsg-3+rpi1

diff --cc debian/changelog
index cd7a1896a9c041022d10ab85e9098460c39d6e3d,4250d4720c2e2834e2320e41f91b8a5fbfbc3e48..dbeabb485fd939f292d1542c20e3305f9b9501b9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,31 @@@
- hwloc (2.1.0+dfsg-2+rpi1) bullseye-staging; urgency=medium
++hwloc (2.1.0+dfsg-3+rpi1) bullseye-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 30 Nov 2019 14:27:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Jan 2020 23:13:53 +0000
++
+ hwloc (2.1.0+dfsg-3) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Use secure URI in Homepage field.
+   * Update standards version to 4.4.1, no changes needed.
+   * Move source package lintian overrides to debian/source.
+   * Bump debhelper from old 9 to 12.
+   * Set debhelper-compat version in Build-Depends.
+   * Set upstream metadata fields: Bug-Submit (from ./configure), Name
+     (from ./configure).
+   * Drop unnecessary dependency on dh-autoreconf.
+   * Drop unnecessary dh arguments: --parallel
+   * Rely on pre-initialized dpkg-architecture variables.
+ 
+   [ Samuel Thibault ]
+   * control: Add libxnvctrl-dev build-dep to ship the opengl plugin.
+   * control: Make libhwloc-plugins package break+replace
+     libhwloc-contrib-plugins which used to ship the opengl plugin.
+   * patches/hurd-mem: Add memsize support for hurd-i386.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Wed, 01 Jan 2020 15:01:22 +0100
  
  hwloc (2.1.0+dfsg-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge