Manual merge of version 1.11.13-1+rpi1 and 2.1.0+dfsg-2 to produce 2.1.0+dfsg-2+rpi1

diff --cc debian/changelog
index 92d7cd1df5aa3315e07a2a67e683a8305391f0eb,50c8a11fd990f8a8574b0484d1142655d68d970d..cd7a1896a9c041022d10ab85e9098460c39d6e3d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,110 +1,117 @@@
- hwloc (1.11.13-1+rpi1) bullseye-staging; urgency=medium
++hwloc (2.1.0+dfsg-2+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Aug 2019 20:20:30 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 30 Nov 2019 14:27:51 +0000
++
+ hwloc (2.1.0+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Tue, 26 Nov 2019 14:27:34 +0100
+ 
+ hwloc (2.1.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - tests/test-util: Update list of tools.
+     - tests/gather: Ignore warning about is_thisystem.
+     - tests/fake-plugin: Drop, this plugin is not actually shipped.
+   * watch: Generalize pattern.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Sun, 13 Oct 2019 18:42:11 +0200
+ 
+ hwloc (2.0.4+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * debian/tests/test-util:
+     - Add missing @DIFF@ replacement.
+     - Fix getting upstream version.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Mon, 10 Jun 2019 22:43:03 +0200
+ 
+ hwloc (2.0.3+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Fri, 14 Dec 2018 16:27:38 +0100
+ 
+ hwloc (2.0.2+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Rename libhwloc5 to libhwloc15 according to soname bump.
+   * tests/: Update tests.
+   * source.lintian-override: Ignore missing conflict between hwloc-dbgsym and
+     hwloc-nox-dbgsym, the corresponding packages explicitly conflict already.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Sat, 22 Sep 2018 12:35:16 +0200
+ 
+ hwloc (2.0.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * patches/ia64-shmem: Remove, upstreamed.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Mon, 05 Feb 2018 22:40:49 +0100
+ 
+ hwloc (2.0.0~rc2-2) experimental; urgency=medium
+ 
+   * patches/ia64-shmem: Cherry-pick fix for IA64.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Tue, 30 Jan 2018 19:42:36 +0100
+ 
+ hwloc (2.0.0~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * patches/autogen,memfix,glcl_test: Remove, fixed upstream.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Mon, 29 Jan 2018 22:43:11 +0100
+ 
+ hwloc (2.0.0~beta1-4) experimental; urgency=medium
+ 
+   * Fix get_last_cpu_location test for builds within qemu-user, which
+     introduce an additional thread.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Fri, 29 Dec 2017 12:12:54 +0100
+ 
+ hwloc (2.0.0~beta1-3) experimental; urgency=medium
+ 
+   * rules: Dump test failure logs.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Wed, 27 Dec 2017 23:46:46 +0100
+ 
+ hwloc (2.0.0~beta1-2) experimental; urgency=medium
+ 
+   * control: Make libudev-dev dependency linux-only.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Wed, 27 Dec 2017 20:40:37 +0100
+ 
+ hwloc (2.0.0~beta1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Rename libhwloc5 to libhwloc12 according to soname bump.
+     - Drop old compatibility links, now useless.
+     - patches/cpuset_ABI: Remove patch since we bump the ABI.
+     - patches/bashism: Remove patch, source disappeared.
+     - patches/format: Patch merged upstream.
+     - patches/autogen: Add dump netloc/Makefile.am so autogen can run.
+     - patches/memfix: Fix bug with single NUMA memory object addition.
+   * control:
+     - Add w3m and libudev-dev build-depend.
+     - Bump Standards-Version to 4.1.1 (no changes).
+     - Drop spurious old provides/conflicts/replaces for libhwloc0-5.
+   * rules: Don't abort the whole testsuite if one test fails.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Thu, 21 Dec 2017 09:54:56 +0100
+ 
+ hwloc (1.11.13-2) UNRELEASED; urgency=medium
+ 
+   * control: Bump Standards-Version to 4.4.0 (no changes).
+   * control: Only suggest libhwloc-contrib-plugins where it is available, on
+     amd64.
+   * source/options: Drop compression option.
+   * libhwloc-doc.lintian-overrides: Silence warnings.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Mon, 05 Aug 2019 23:36:28 +0200
  
  hwloc (1.11.13-1) unstable; urgency=medium
  

diff --cc debian/rules
index f7efc96463161987bb35c259250aa5f61ff615df,6d747f7c16693035a79b1ba654e21ceabbda029a..557fe234215f64c684d0d3a2140b602cbcd1c301
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -27,4 -18,5 +18,5 @@@ override_dh_makeshlibs
        dh_makeshlibs -V
  
  override_dh_auto_test:
-       echo testsuite disabled
 -      HWLOC_TEST_DONTCHECK_PROC_CPULOCATION=1 dh_auto_test -- -k || \
 -              ( cat $$(find . -name \*.log) ; false )
++      #HWLOC_TEST_DONTCHECK_PROC_CPULOCATION=1 dh_auto_test -- -k || \
++      #       ( cat $$(find . -name \*.log) ; false )