Import hwloc_2.1.0+dfsg-2.debian.tar.xz

[dgit import tarball hwloc 2.1.0+dfsg-2 hwloc_2.1.0+dfsg-2.debian.tar.xz]

diff --git a/changelog b/changelog
new file mode 100644 (file)
index 0000000..50c8a11
--- /dev/null
+++ b/changelog
@@ -0,0 +1,652 @@
+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
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 24 Jul 2019 17:33:43 +0200
+
+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
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 14 Dec 2018 16:19:49 +0100
+
+hwloc (1.11.11-2) unstable; urgency=medium
+
+  * debian/tests/test-util: Automatically get hwloc version (Closes: #908100).
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 22 Sep 2018 11:12:43 +0200
+
+hwloc (1.11.11-1) unstable; urgency=medium
+
+  * New upstream release.
+    - patches/test-xml: Remove patch, merged upstream.
+  * control: Bump Standards-Version to 4.2.0 (no changes).
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 05 Sep 2018 16:12:21 +0200
+
+hwloc (1.11.10-3) unstable; urgency=medium
+
+  * control: Bump Standards-Version to 4.1.5 (no changes).
+  * patches/test-xml: cherry-pick upstream fix for xml test.
+  * tests/: Add autopkgtest.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 17 Jul 2018 02:51:28 +0200
+
+hwloc (1.11.10-2) unstable; urgency=medium
+
+  [ Alexander Kurtz ]
+  * control: Mark libhwloc-plugins as Multi-Arch: same (Closes: Bug#901558).
+
+  [ Helmut Grohne ]
+  * Mark libhwloc-common and libhwloc-doc Multi-Arch: foreign.
+
+  [ Samuel Thibault ]
+  * Use https URL
+  * Bump Standards-Version to 4.1.4
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 17 Jun 2018 15:39:50 +0200
+
+hwloc (1.11.10-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 26 Mar 2018 11:46:01 +0200
+
+hwloc (1.11.9-1) unstable; urgency=medium
+
+  * control: Bump Standards-Version to 4.1.1 (no changes).
+  * patches/format: Remove, merged upstream.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 19 Jan 2018 09:46:54 +0100
+
+hwloc (1.11.8-1) unstable; urgency=medium
+
+  * New upstream release.
+  * control: Migrate priority to optional.
+  * control: Bump Standards-Version to 4.1.0.
+  * patches/format: Avoid letting snprintf interpret process name as format.
+  * control: Make libhwloc-plugins depend only on the same upstream source
+    version, that is where plugin compatibility is guaranteed.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 06 Sep 2017 17:44:42 +0200
+
+hwloc (1.11.7-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 28 Apr 2017 16:56:32 +0200
+
+hwloc (1.11.6-1) experimental; urgency=medium
+
+  * New upstream release.
+  * control: Make libhwloc-plugins depend on the same version of libhwloc5.
+    Closes: #846128.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 28 Nov 2016 16:54:46 +0100
+
+hwloc (1.11.5-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 21 Nov 2016 11:20:05 +0100
+
+hwloc (1.11.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * rules: Re-enable parallel build.
+  * control: Bump Standards-Version to 3.9.8 (no change)
+  * patches/test-fix: Remove upstream fix.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 29 Aug 2016 10:14:01 +0200
+
+hwloc (1.11.3-2) unstable; urgency=medium
+
+  * patches/test-fix: Update to upstream fix.
+  * control: Build-depend on valgrind only on archs which have it.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 03 May 2016 01:29:42 +0200
+
+hwloc (1.11.3-1) unstable; urgency=medium
+
+  * New upstream release
+    - control: Add valgrind build-dep.
+    - patch/private_doxygen: Remove, merged upstream.
+  * patches/test-fix: Fix an xml testcase.
+  * rules: Do not ignore testsuite failure.
+  * contrib: control: Restrict to amd64, only architecture supported by nvidia.
+  * contrib: rules: Make dh_auto_install in debian/tmp, so dh_install can still work.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 27 Apr 2016 18:56:17 +0200
+
+hwloc (1.11.2-3) unstable; urgency=medium
+
+  * Also install hwloc-dump-hwdata on linux x32.
+  * control: Bump Standards-Version to 3.9.7 (no change).
+  * patches/private_doxygen: New upstream patch to fix build now that doxygen
+    respects \private. Closes: #814493.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 16 Feb 2016 17:22:40 +0100
+
+hwloc (1.11.2-2) unstable; urgency=medium
+
+  * Only install hwloc-dump-hwdata on linux x86.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 29 Dec 2015 20:14:57 +0100
+
+hwloc (1.11.2-1) unstable; urgency=medium
+
+  * New upstream release
+    - hwloc.install: Add /usr/sbin for hwloc-dump-hwdata.
+  * control:
+    - Drop multiarch-support pre-depend.
+    - Enable numa on mips64*. Closes: #806700.
+  * compat: Bump to 9.
+  * rules: Clear.
+  * hwloc.menu: Remove, replaced by desktop file.
+  * patches/bashism: Make hwloc-assembler-remote use bash since it uses
+    bashisms. Closes: #772231.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 29 Dec 2015 18:31:50 +0100
+
+hwloc (1.11.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add opencl-dev build-dep alternative to ocl-icd-opencl-dev.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 19 Oct 2015 18:35:48 +0200
+
+hwloc (1.11.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * rules: drop jquery.js.
+  * control: make libhwloc-doc depend on libjs-jquery to get jquery.js.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 18 Jun 2015 10:00:13 +0200
+
+hwloc (1.10.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 01 May 2015 20:08:01 +0200
+
+hwloc (1.10.0-3) unstable; urgency=medium
+
+  * Make packages depend on at least the same version of libhwloc5.
+    Closes: #767687.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 02 Nov 2014 15:25:24 +0100
+
+hwloc (1.10.0-2) unstable; urgency=medium
+
+  * control:
+    - Add common tools names in the description of hwloc.
+    - Add arm64, ppc64el and sparc in list of archs with libnuma-dev.
+    - Make libhwloc-dev depend on libnuma-dev only where it is used.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 10 Oct 2014 16:22:19 +0200
+
+hwloc (1.10.0-1) unstable; urgency=medium
+
+  * New upstream release.
+    - control: make libhwloc5 Break older libhwloc-plugins.
+  * Bump Standards-Version to 3.9.6 (no changes).
+  * Fix libhwloc-dev Depends.
+  * libhwloc-doc.docs: Add doc/examples.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 08 Oct 2014 14:37:38 +0200
+
+hwloc (1.9.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 29 Aug 2014 14:50:07 +0200
+
+hwloc (1.9-5) unstable; urgency=medium
+
+  * Use dh_autoreconf. Closes: #755824.
+  * patches/desktop: Upstream patch to add desktop file for menu integration.
+    Closes: #758252.
+  * hwloc.install: Add desktop file.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 21 Aug 2014 23:50:44 +0200
+
+hwloc (1.9-4) unstable; urgency=medium
+
+  * Also ship lstopo-no-graphics in the hwloc package, to fix
+    hwloc-gather-topology, and possibly other scripts that people might be
+    using. Closes: #748927.
+  * Drop autotools-dev and help2man build-dependencies, now unused.
+  * Add --enable-doxygen to really build the documentation.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 11 Jul 2014 10:11:54 +0200
+
+hwloc (1.9-3) unstable; urgency=medium
+
+  * Use [!hurd-i386] instead of [!hurd-any], the latter doesn't seem to be
+    working.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 02 May 2014 02:26:51 +0200
+
+hwloc (1.9-2) unstable; urgency=medium
+
+  * Do not depend on opencl-icd on hurd.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 01 May 2014 21:35:19 +0200
+
+hwloc (1.9-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 26 Mar 2014 12:36:58 +0100
+
+hwloc (1.8.1-1) unstable; urgency=medium
+
+  * New upstream release. Closes: #737607.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 04 Feb 2014 15:18:33 +0100
+
+hwloc (1.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * control: Update debian packaging VCS URL.
+  * Bump Standards-Version to 3.9.5 (no changes).
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 19 Nov 2013 13:59:51 +0100
+
+hwloc (1.7.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add ocl-icd-opencl-dev and opencl-headers build-dependencies to build opencl
+    plugin.
+  * Bump Standards-Version to 3.9.4 (no changes).
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 03 Sep 2013 12:41:33 +0200
+
+hwloc (1.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Move generated header to multiarch place. Closes: #707748.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 22 May 2013 01:14:30 +0200
+
+hwloc (1.7-3) unstable; urgency=low
+
+  * Do not symlink lstopo into hwloc-info any more.
+  * control: explicitly build-depend on pkg-config for PCI support.
+  * patches/cpuset_ABI: Restore cpuset functions which were dropped without
+    soname bump. Closes: #707452.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 14 May 2013 12:04:12 +0200
+
+hwloc (1.7-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * control:
+    - Make libhwloc5 Suggest libhwloc-contrib-plugins.
+    - Make libhwloc-plugins depend on libhwloc5.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 07 May 2013 15:19:47 +0200
+
+hwloc (1.7-1) experimental; urgency=low
+
+  * New upstream release.
+  * control: Replace libpci-dev build-dep with libpciaccess-dev.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 11 Apr 2013 13:59:53 +0200
+
+hwloc (1.6.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * control: Make libhwloc-dev Multi-Arch: same.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 18 Jan 2013 09:48:08 +0100
+
+hwloc (1.6-2) experimental; urgency=low
+
+  * rules: Enable plugins.
+  * control:
+    - Add libltdl-dev build-depends.
+    - Add new hwloc-plugins package, containing libpci and libxml plugins.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 07 Dec 2012 04:59:17 +0100
+
+hwloc (1.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * rules: Do not ignore all make distclean errors, only ignore Makefile not being
+    present.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 03 Dec 2012 20:28:04 +0100
+
+hwloc (1.5-1) experimental; urgency=low
+
+  * New upstream release.
+  * patches/unitialized_bytes_r4576,gfbsd-ftbfs_r4578: Remove, merged
+    upstream.
+  * rules: Do not build hwloc twice any more, use lstopo-no-graphics for the
+    hwloc-nox package.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 30 Jul 2012 20:27:11 +0200
+
+hwloc (1.4.1-4) unstable; urgency=low
+
+  * patches/gfbsd-ftbfs_r4578: New upstream patch to avoid missing
+    cpuset_setaffinity function on kfreebsd-any
+  * patches/unitialized_bytes_r4576: New upstream patch to fix uninitialized
+    pointers in topology structure.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 07 Jul 2012 01:18:49 -0300
+
+hwloc (1.4.1-3) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Restore ABI compatibility symlinks and provide/replace/conflict, except
+    with non-dangling symlinks this time. Closes: #664571.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 06 Jul 2012 22:13:03 -0300
+
+hwloc (1.4.1-2) unstable; urgency=low
+
+  * Remove ABI compatibility symlinks and provide/replace/conflict, ldconfig
+    actually removes them so they do not actually work.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 28 Mar 2012 01:43:52 +0200
+
+hwloc (1.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * control: Bump Standards-Version to 3.9.3 (no changes).
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 25 Feb 2012 17:41:58 +0100
+
+hwloc (1.4-1) unstable; urgency=low
+
+  * New upstream release, rename libhwloc4 package into libhwloc5 due to
+    soname change.
+  * Add ABI compatibility symlinks, and make libhwloc5 provide, replace and
+    conflict with previous versions.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 26 Jan 2012 17:00:20 +0100
+
+hwloc (1.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add hwloc-dev dependency on libpci-dev.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 20 Dec 2011 13:46:54 +0100
+
+hwloc (1.3-1) unstable; urgency=low
+
+  * New upstream release, rename libhwloc3 package into libhwloc4 due to
+    soname change.
+  * debian/control: Build-Depend on libpci-dev.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 12 Nov 2011 23:08:06 +0100
+
+hwloc (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * control: Depend on hardening-check.
+  * rules: Set DEB_BUILD_HARDENING=1 to enable hardening.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 14 Sep 2011 17:18:20 +0200
+
+hwloc (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/libhwloc-dev.install: Move pkg-config file to multiarch place.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 09 Jun 2011 13:12:59 +0200
+
+hwloc (1.2-3) unstable; urgency=low
+
+  * debian/rules: Set libdir to DEB_HOST_MULTIARCH.
+  * debian/control: Make libhwloc3 pre-depend on multiarch-support.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 05 Jun 2011 12:38:54 +0200
+
+hwloc (1.2-2) unstable; urgency=low
+
+  * debian/rules: Use DEB_HOST_GNU_TYPE for /usr/lib path until shlibdeps
+    finds libraries in DEB_HOST_MULTIARCH on any-i386.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 08 May 2011 10:24:47 +0200
+
+hwloc (1.2-1) unstable; urgency=low
+
+  * New upstream release, rename libhwloc2 package into libhwloc3 due to
+    soname change.
+  * debian/control:
+    - Build-depend on dpkg-dev (>= 1.16)
+    - Bump Standards-Version to 3.9.2
+  * debian/rules: Use DEB_HOST_MULTIARCH for /usr/lib path.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 10 Apr 2011 20:13:45 +0200
+
+hwloc (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Replace doxygen+texlive* build dependency with
+    doxygen-latex (Closes: Bug#616253).
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 03 Mar 2011 15:06:51 +0100
+
+hwloc (1.1.1-1) unstable; urgency=low
+
+  * New upstream release, rename libhwloc1 package into libhwloc2 due to
+    soname change.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 06 Feb 2011 04:28:37 +0100
+
+hwloc (1.1-2) experimental; urgency=low
+
+  * Rename libhwloc0 packages name into libhwloc1 due to soname change.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 03 Jan 2011 11:12:18 +0100
+
+hwloc (1.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - debian/patches/no-ibverbs-dep: Drop, merged upstream.
+    - debian/copyright: Update.
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 17 Dec 2010 01:51:24 +0100
+
+hwloc (1.0.2-2) unstable; urgency=low
+
+  * debian/control:
+    - Bump Standards-Version to 3.9.1 (no change needed).
+    - Build-Depend on autoconf (>= 2.63), Build-conflicts with autoconf2.13
+  * debian/rules:
+    - Run autoconf before build to permit autoconf patches.
+    - Remove configure on clean.
+    - Fix typo for parallel build.
+  * debian/patches/no-ibverbs-dep: New upstream patch to avoid libibverbs
+    dependency.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 27 Jul 2010 11:43:35 +0200
+
+hwloc (1.0.2-1) unstable; urgency=low
+
+  New upstream release.
+  * debian/hwloc-nox.manpages, debian/hwloc.manpages: Install hwloc.7 too.
+  * debian/libhwloc-doc.manpages: No need to install linux_* any more.
+  * debian/control:
+    - Bump Standards-Version to 3.9.0 (no change needed).
+    - Replace [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] with [linux-any].
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 21 Jul 2010 22:09:08 +0200
+
+hwloc (1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Build-Depend on cdbs.
+  * debian/rules: Include /usr/share/cdbs/1/class/langcore.mk instead of
+    parsing DEB_BUILD_OPTIONS by hand, enable parallel build.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 18 May 2010 18:23:34 +0200
+
+hwloc (1.0~rc1-1) experimental; urgency=low
+
+  * New upstream release canditate.
+  * debian/format/options: Switch to bz2 compression.
+  * debian/control:
+    - Fix libhwloc-common short description.
+    - Remove duplicate Section field.
+    - Bump Standards-Version to 3.8.4 (no change needed).
+    - Add libibverbs-dev Build-Depends on Linux ports.
+  * debian/rules: Pass --enable-static to configure.
+  * debian/hwloc-nox.install: Use a wildcard instead of the list of hwloc-*
+    tools.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 20 Apr 2010 14:53:48 +0200
+
+hwloc (0.9.3~rc1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * patches/binutils-gold.patch: Merged upstream.
+  * patches/hwloc-hello.patch: Merged upstream.
+  * control: Add Build-Depends-Indep: doxygen, texlive-latex-base, transfig to
+    regenerate the documentation.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 24 Nov 2009 20:42:08 +0100
+
+hwloc (0.9.2-2) unstable; urgency=low
+
+  * control:
+    - Enable libnuma-dev build-dep only on archs which have it.
+    - Add libncurses5-dev build-dep.
+    - Add expanded "Hardware Locality" in the description.
+  * rules: Run the testsuite but don't fail for now.
+  * source/format: Switch to 3.0 format (quilt).
+  * patches/binutils-gold.patch: Backported upstream patch to fix link
+    with binutils-gold.
+  * patches/hwloc-hello.patch: Backported upstream patch to always try
+    to run hwloc-hello.
+  * docs: Remove.
+  * libhwloc-doc.install: Move documentation to /usr/share/doc/libhwloc-doc.
+  * libhwloc-doc.docs: Add NEWS, README and html documentation.
+  * hwloc.docs, hwloc-nox.docs: Add NEWS and README files.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 19 Nov 2009 03:35:18 +0100
+
+hwloc (0.9.2-1) unstable; urgency=low
+
+  * Initial release (Closes: Bug#535615)
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 18 Aug 2009 01:35:03 +0200

diff --git a/compat b/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
+++ b/compat
@@ -0,0 +1 @@
+9

diff --git a/control b/control
new file mode 100644 (file)
index 0000000..914e71a
--- /dev/null
+++ b/control
@@ -0,0 +1,173 @@
+Source: hwloc
+Priority: optional
+Maintainer: Samuel Thibault <sthibault@debian.org>
+Build-Depends: debhelper (>= 9), libltdl-dev,
+  valgrind [amd64 arm64 armhf i386 mips mipsel powerpc ppc64el s390x mips64el ppc64],
+  libcairo2-dev, libx11-dev, libxml2-dev, libxml2-utils, libncurses5-dev,
+  libnuma-dev [amd64 arm64 i386 ia64 mips mips64 mipsel mips64el powerpc ppc64el sparc],
+  libpciaccess-dev, libudev-dev [linux-any], pkg-config,
+  libibverbs-dev [linux-any],
+  ocl-icd-opencl-dev [!hurd-i386] | opencl-dev, opencl-headers,
+  autoconf (>= 2.63), w3m,
+  dh-autoreconf,
+  dpkg-dev (>= 1.16)
+Build-Depends-Indep: doxygen-latex, transfig
+Build-Conflicts: autoconf2.13
+Standards-Version: 4.4.0
+Section: libs
+Homepage: http://www.open-mpi.org/projects/hwloc/
+Vcs-Git: https://github.com/open-mpi/hwloc-debian.git
+Vcs-Browser: https://github.com/open-mpi/hwloc-debian
+
+Package: hwloc
+Section: admin
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Hierarchical view of the machine - utilities
+ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ hwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ hwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains utilities to show the topology of the machine (lstopo and
+ hwloc-ls), manipulate cpu masks (hwloc-calc), and bind processes (hwloc-bind).
+
+Package: hwloc-nox
+Section: admin
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: hwloc
+Description: Hierarchical view of the machine - non-X version of utilities
+ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ hwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ hwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains utilities to show the topology of the machine (lstopo
+ and hwloc-ls, without X support), manipulate cpu masks (hwloc-calc), and bind
+ processes (hwloc-bind).
+
+Package: libhwloc-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, libhwloc15 (= ${binary:Version}), libnuma-dev [amd64 arm64 i386 ia64 mips mips64 mipsel mips64el powerpc ppc64el sparc], libltdl-dev
+Description: Hierarchical view of the machine - static libs and headers
+ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ libhwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ libhwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains static libraries and development headers.
+
+Package: libhwloc15
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libhwloc-plugins
+Breaks: libhwloc-plugins (<< 1.10~), libhwloc-contrib-plugins (<< 1.10~)
+Suggests: libhwloc-contrib-plugins [amd64]
+Description: Hierarchical view of the machine - shared libs
+ libhwloc provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ libhwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ libhwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains shared libraries.
+
+Package: libhwloc-plugins
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc15 (>= ${source:Upstream-Version}~), libhwloc15 (<< ${source:Upstream-Version}A)
+Description: Hierarchical view of the machine - plugins
+ libhwloc provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ libhwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ libhwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains plugins to add more discovery support. This includes
+  - PCI support
+  - libxml support
+
+Package: libhwloc-common
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: Hierarchical view of the machine - common files
+ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ libhwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ libhwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains the XML DTD of the lstopo XML output.
+
+Package: libhwloc-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, libjs-jquery
+Description: Hierarchical view of the machine - documentation
+ Hardware Locality (hwloc) provides a portable abstraction (across OS, versions,
+ architectures, ...) of the hierarchical topology of modern architectures. It
+ primarily aims at helping high-performance computing applications with
+ gathering information about the hardware so as to exploit it accordingly and
+ efficiently.
+ .
+ libhwloc provides a hierarchical view of the machine, NUMA memory nodes,
+ sockets, shared caches, cores and simultaneous multithreading. It also gathers
+ various attributes such as cache and memory information.
+ .
+ libhwloc supports old kernels not having sysfs topology information,
+ with knowledge of cpusets, offline cpus, and Kerrighed support
+ .
+ This package contains documentation.

diff --git a/copyright b/copyright
new file mode 100644 (file)
index 0000000..04cbc11
--- /dev/null
+++ b/copyright
@@ -0,0 +1,52 @@
+This package was debianized by Samuel Thibault <sthibault@debian.org> on
+Mon, 06 Jul 2009 10:55:29 +0200.
+
+It was downloaded from http://www.open-mpi.org/projects/hwloc/
+
+Upstream Authors:
+
+    Cédric Augonnet <Cedric.Augonnet@labri.fr>
+    Jérôme Clet-Ortega <Jerome.Clet-Ortega@labri.fr>
+    Ludovic Courtès <Ludovic.Courtes@inria.fr>
+    Brice Goglin <Brice.Goglin@inria.fr>
+    Nathalie Furmento <Nathalie.Furmento@labri.fr>
+    Samuel Thibault <Samuel.Thibault@labri.fr>
+    Jeff Squyres <jsquyres@cisco.com>
+
+Copyright:
+
+    Copyright © 2009 CNRS
+    Copyright © 2009-2014 inria.  All rights reserved.
+    Copyright © 2009-2014 Université Bordeaux 1
+    Copyright © 2009-2014 Cisco Systems, Inc.  All rights reserved.
+
+License:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The Debian packaging is:
+
+    Copyright (C) 2009-2014 Samuel Thibault <sthibault@debian.org>
+
+and is licensed under the GPL version 3, 
+see `/usr/share/common-licenses/GPL-3'.

diff --git a/gbp.conf b/gbp.conf
new file mode 100644 (file)
index 0000000..63e24f5
--- /dev/null
+++ b/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch = upstream-2-dfsg
+
+[import-orig]
+upstream-branch = upstream-2
+merge = False

diff --git a/hwloc-nox.docs b/hwloc-nox.docs
new file mode 100644 (file)
index 0000000..50bd824
--- /dev/null
+++ b/hwloc-nox.docs
@@ -0,0 +1,2 @@
+NEWS
+README

diff --git a/hwloc-nox.install b/hwloc-nox.install
new file mode 100644 (file)
index 0000000..acf94e3
--- /dev/null
+++ b/hwloc-nox.install
@@ -0,0 +1,2 @@
+usr/bin/lstopo-no-graphics
+usr/bin/hwloc-*

diff --git a/hwloc-nox.links b/hwloc-nox.links
new file mode 100644 (file)
index 0000000..e5104c9
--- /dev/null
+++ b/hwloc-nox.links
@@ -0,0 +1,2 @@
+/usr/bin/lstopo-no-graphics /usr/bin/lstopo
+/usr/bin/lstopo /usr/bin/hwloc-ls

diff --git a/hwloc-nox.manpages b/hwloc-nox.manpages
new file mode 100644 (file)
index 0000000..b09d6a9
--- /dev/null
+++ b/hwloc-nox.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/*.1
+debian/tmp/usr/share/man/man7/*.7

diff --git a/hwloc.docs b/hwloc.docs
new file mode 100644 (file)
index 0000000..50bd824
--- /dev/null
+++ b/hwloc.docs
@@ -0,0 +1,2 @@
+NEWS
+README

diff --git a/hwloc.install b/hwloc.install
new file mode 100644 (file)
index 0000000..ea08b2d
--- /dev/null
+++ b/hwloc.install
@@ -0,0 +1,4 @@
+usr/bin/lstopo
+usr/bin/lstopo-no-graphics
+usr/bin/hwloc-*
+usr/share/applications

diff --git a/hwloc.install.amd64 b/hwloc.install.amd64
new file mode 120000 (symlink)
index 0000000..987e33c
--- /dev/null
+++ b/hwloc.install.amd64
@@ -0,0 +1 @@
+hwloc.install.x86
\ No newline at end of file

diff --git a/hwloc.install.i386 b/hwloc.install.i386
new file mode 120000 (symlink)
index 0000000..987e33c
--- /dev/null
+++ b/hwloc.install.i386
@@ -0,0 +1 @@
+hwloc.install.x86
\ No newline at end of file

diff --git a/hwloc.install.x32 b/hwloc.install.x32
new file mode 120000 (symlink)
index 0000000..987e33c
--- /dev/null
+++ b/hwloc.install.x32
@@ -0,0 +1 @@
+hwloc.install.x86
\ No newline at end of file

diff --git a/hwloc.install.x86 b/hwloc.install.x86
new file mode 100644 (file)
index 0000000..9427a5c
--- /dev/null
+++ b/hwloc.install.x86
@@ -0,0 +1,5 @@
+usr/bin/lstopo
+usr/bin/lstopo-no-graphics
+usr/bin/hwloc-*
+usr/share/applications
+usr/sbin

diff --git a/hwloc.links b/hwloc.links
new file mode 100644 (file)
index 0000000..1383634
--- /dev/null
+++ b/hwloc.links
@@ -0,0 +1 @@
+/usr/bin/lstopo /usr/bin/hwloc-ls

diff --git a/hwloc.manpages b/hwloc.manpages
new file mode 100644 (file)
index 0000000..b09d6a9
--- /dev/null
+++ b/hwloc.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/*.1
+debian/tmp/usr/share/man/man7/*.7

diff --git a/libhwloc-common.install b/libhwloc-common.install
new file mode 100644 (file)
index 0000000..f4d081c
--- /dev/null
+++ b/libhwloc-common.install
@@ -0,0 +1 @@
+/usr/share/hwloc

diff --git a/libhwloc-dev.install b/libhwloc-dev.install
new file mode 100644 (file)
index 0000000..abebe49
--- /dev/null
+++ b/libhwloc-dev.install
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc

diff --git a/libhwloc-doc.docs b/libhwloc-doc.docs
new file mode 100644 (file)
index 0000000..7d50ca5
--- /dev/null
+++ b/libhwloc-doc.docs
@@ -0,0 +1,4 @@
+NEWS
+README
+doc/doxygen-doc/html
+doc/examples/*.c

diff --git a/libhwloc-doc.links b/libhwloc-doc.links
new file mode 100644 (file)
index 0000000..ac5b4c6
--- /dev/null
+++ b/libhwloc-doc.links
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/libhwloc-doc/html/jquery.js

diff --git a/libhwloc-doc.lintian-overrides b/libhwloc-doc.lintian-overrides
new file mode 100644 (file)
index 0000000..98b3554
--- /dev/null
+++ b/libhwloc-doc.lintian-overrides
@@ -0,0 +1,3 @@
+# These are generated by doxygen, see https://github.com/doxygen/doxygen/issues/2625
+manpage-has-bad-whatis-entry usr/share/man/man3/hwloc_*
+manpage-has-bad-whatis-entry usr/share/man/man3/hwlocality_*

diff --git a/libhwloc-doc.manpages b/libhwloc-doc.manpages
new file mode 100644 (file)
index 0000000..242943a
--- /dev/null
+++ b/libhwloc-doc.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man3/*.3

diff --git a/libhwloc-plugins.install b/libhwloc-plugins.install
new file mode 100644 (file)
index 0000000..476929c
--- /dev/null
+++ b/libhwloc-plugins.install
@@ -0,0 +1 @@
+usr/lib/*/hwloc/*.so

diff --git a/libhwloc15.install b/libhwloc15.install
new file mode 100644 (file)
index 0000000..3ddde58
--- /dev/null
+++ b/libhwloc15.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*

diff --git a/patches/doc-nopdf b/patches/doc-nopdf
new file mode 100644 (file)
index 0000000..b5d9027
--- /dev/null
+++ b/patches/doc-nopdf
@@ -0,0 +1,24 @@
+---
+ doc/Makefile.am |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -184,7 +184,7 @@ $(DOX_LETTERPDF): $(DOX_TAG)
+       done; \
+       mv letter-refman.pdf $(DOCDIR)/$(DOX_LETTERPDF)
+ 
+-doc: $(DOX_TAG) $(DOX_LETTERPDF) $(DOX_A4PDF)
++doc: $(DOX_TAG)
+ 
+ else !HWLOC_BUILD_DOXYGEN
+ 
+@@ -219,7 +219,7 @@ if HWLOC_INSTALL_DOXYGEN
+ # standalone mode).
+ #
+ 
+-pdf_DATA = $(DOX_A4PDF) $(DOX_LETTERPDF)
++pdf_DATA =
+ 
+ #
+ # Install the HWLOC_* and hwloc_* man pages.  It would be great to

diff --git a/patches/series b/patches/series
new file mode 100644 (file)
index 0000000..a4b81a2
--- /dev/null
+++ b/patches/series
@@ -0,0 +1 @@
+doc-nopdf

diff --git a/rules b/rules
new file mode 100755 (executable)
index 0000000..6d747f7
--- /dev/null
+++ b/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@ --with autoreconf --parallel
+
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+override_dh_auto_configure:
+       dh_auto_configure -- --enable-static --enable-plugins --enable-doxygen
+
+override_dh_auto_install:
+       dh_auto_install
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/hwloc/autogen
+       mv $(CURDIR)/debian/tmp/usr/include/hwloc/autogen/config.h $(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/hwloc/autogen/
+
+override_dh_makeshlibs:
+       dh_makeshlibs -V
+
+override_dh_auto_test:
+       HWLOC_TEST_DONTCHECK_PROC_CPULOCATION=1 dh_auto_test -- -k || \
+               ( cat $$(find . -name \*.log) ; false )

diff --git a/source.lintian-overrides b/source.lintian-overrides
new file mode 100644 (file)
index 0000000..a9738ff
--- /dev/null
+++ b/source.lintian-overrides
@@ -0,0 +1,2 @@
+# hwloc and hwloc-nox already conflict anyway
+binaries-have-file-conflict hwloc-dbgsym hwloc-nox-dbgsym *

diff --git a/source/format b/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/tests/allowed b/tests/allowed
new file mode 100644 (file)
index 0000000..7b0d5ca
--- /dev/null
+++ b/tests/allowed
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=tests/hwloc/linux/allowed/test-topology.sh /bin/sh ./debian/tests/test-util tests/hwloc/linux/allowed/test1.output

diff --git a/tests/annotate b/tests/annotate
new file mode 100644 (file)
index 0000000..13fac40
--- /dev/null
+++ b/tests/annotate
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/hwloc/test-hwloc-annotate.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/calc b/tests/calc
new file mode 100644 (file)
index 0000000..b83cb8d
--- /dev/null
+++ b/tests/calc
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/hwloc/test-hwloc-calc.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/compress-dir b/tests/compress-dir
new file mode 100644 (file)
index 0000000..6aab67a
--- /dev/null
+++ b/tests/compress-dir
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/hwloc/test-hwloc-compress-dir.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/control b/tests/control
new file mode 100644 (file)
index 0000000..ad4432b
--- /dev/null
+++ b/tests/control
@@ -0,0 +1,9 @@
+Depends: hwloc-nox | hwloc
+Tests: lstopo calc annotate compress-dir distrib info gather allowed
+
+Depends: hwloc-nox | hwloc
+Tests: diffpatch linux
+Restrictions: allow-stderr
+
+Depends: hwloc-nox | hwloc, libxml2-utils
+Tests: xml

diff --git a/tests/diffpatch b/tests/diffpatch
new file mode 100644 (file)
index 0000000..cd553cf
--- /dev/null
+++ b/tests/diffpatch
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/hwloc/test-hwloc-diffpatch.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/distrib b/tests/distrib
new file mode 100644 (file)
index 0000000..aaa8225
--- /dev/null
+++ b/tests/distrib
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/hwloc/test-hwloc-distrib.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/gather b/tests/gather
new file mode 100644 (file)
index 0000000..0ca6ad6
--- /dev/null
+++ b/tests/gather
@@ -0,0 +1,2 @@
+#!/bin/bash
+test=tests/hwloc/linux/gather/test-gather-topology.sh /bin/sh ./debian/tests/test-util 2> >( grep -v "must run on the current system topology, while this topology doesn't come from this system." 1>&2 )

diff --git a/tests/info b/tests/info
new file mode 100644 (file)
index 0000000..61fee1c
--- /dev/null
+++ b/tests/info
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/hwloc/test-hwloc-info.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/linux b/tests/linux
new file mode 100644 (file)
index 0000000..829f25b
--- /dev/null
+++ b/tests/linux
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+for i in tests/hwloc/linux/*.output
+do
+  test=tests/hwloc/linux/test-topology.sh /bin/sh ./debian/tests/test-util "$i"
+done

diff --git a/tests/lstopo b/tests/lstopo
new file mode 100644 (file)
index 0000000..8563365
--- /dev/null
+++ b/tests/lstopo
@@ -0,0 +1,2 @@
+#!/bin/sh
+test=utils/lstopo/test-lstopo.sh /bin/sh ./debian/tests/test-util

diff --git a/tests/test-util b/tests/test-util
new file mode 100644 (file)
index 0000000..088205a
--- /dev/null
+++ b/tests/test-util
@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e
+
+HWLOC_VERSION=$(dpkg-parsechangelog --show-field Version | sed -e 's/-[^-]*$//' -e 's/+dfsg$//')
+
+base=$(basename $test)
+sed \
+        -e '/HWLOC_PLUGINS_PATH/d' \
+        -e "/^diff=/d" \
+        -e "/^patch=/d" \
+        -e "/^calc=/d" \
+        -e "/^hcalc=/d" \
+        -e "/^annotate=/d" \
+        -e "/^compress=/d" \
+        -e "/^distrib=/d" \
+        -e "/^info=/d" \
+        -e "/^lstopo=/d" \
+        -e "/^ls=/d" \
+        -e "/^gather=/d" \
+        -e "s=@BASH@=/bin/bash=" \
+        -e "s=@DIFF@=diff=" \
+        -e "s=@HWLOC_DIFF_U@=-u=" \
+        -e "s=@HWLOC_DIFF_W@=-w=" \
+        -e "s=@XMLLINT@=xmllint=" \
+        -e "s=@HWLOC_VERSION@=$HWLOC_VERSION=" \
+        -e "s=@SED@=/bin/sed=" \
+        -e "s=@EXEEXT@==" \
+        -e 's=@HWLOC_HAVE_PCI_TRUE@==' \
+        -e "s=@HWLOC_top_srcdir@=$PWD=" \
+        < $test.in > $AUTOPKGTEST_TMP/$base
+
+export LANG=C
+export LC_ALL=C
+export diff=/usr/bin/hwloc-diff
+export patch=/usr/bin/hwloc-patch
+export calc=/usr/bin/hwloc-calc
+export hcalc=/usr/bin/hwloc-calc
+export annotate=/usr/bin/hwloc-annotate
+export compress=/usr/bin/hwloc-compress-dir
+export distrib=/usr/bin/hwloc-distrib
+export info=/usr/bin/hwloc-info
+export gather=/usr/bin/hwloc-gather-topology
+export lstopo=/usr/bin/lstopo-no-graphics
+export ls=/usr/bin/lstopo-no-graphics
+export TMPDIR=$AUTOPKGTEST_TMP
+chmod +x $AUTOPKGTEST_TMP/$base
+$AUTOPKGTEST_TMP/$base "$@"

diff --git a/tests/xml b/tests/xml
new file mode 100644 (file)
index 0000000..05365db
--- /dev/null
+++ b/tests/xml
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+for i in tests/hwloc/xml/*.xml tests/hwloc/xml/*.output
+do
+  case "$i" in
+    */*.v1.xml )
+      # This is just a hwloc v1 reference
+      continue;;
+  esac
+  test=tests/hwloc/xml/test-topology.sh /bin/sh ./debian/tests/test-util "$i"
+done

diff --git a/watch b/watch
new file mode 100644 (file)
index 0000000..4344018
--- /dev/null
+++ b/watch
@@ -0,0 +1,4 @@
+version=3
+opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/(\d)(rc\d*)$/$1~$2/ \
+https://www.open-mpi.org/software/hwloc/v2.1 \
+https://download.open-mpi.org/release/hwloc/v2.1/hwloc(?:[_\-]v?|)@ANY_VERSION@@ARCHIVE_EXT@