diff -Nru collectd-5.12.0/debian/changelog collectd-5.12.0/debian/changelog --- collectd-5.12.0/debian/changelog 2022-01-20 14:40:42.000000000 +0000 +++ collectd-5.12.0/debian/changelog 2022-02-22 00:17:43.000000000 +0000 @@ -1,3 +1,16 @@ +collectd (5.12.0-9) unstable; urgency=medium + + * [577cd1f] Don't build mysql plugin on kfreebsd* + * [335185e] Disable libvirt plugin on sh4/ia64. + Keeping it disabled on kfreebsd* + * [6f2a0f7] Disable barometer/i2c on hurd + * [3f893cf] Also disable libvirt on alpha. + * [8482e2a] Don't build the xencpu plugin on i386. + Starting with xen version 4.16, xen is no longer built on the i386 architecture in Debian. + Thanks to Maximilian Engelhardt (Closes: #1006250) + + -- Bernd Zeimetz Tue, 22 Feb 2022 01:17:43 +0100 + collectd (5.12.0-8) unstable; urgency=medium [ Kentaro Hayashi ] diff -Nru collectd-5.12.0/debian/control collectd-5.12.0/debian/control --- collectd-5.12.0/debian/control 2022-01-20 14:40:42.000000000 +0000 +++ collectd-5.12.0/debian/control 2022-02-22 00:17:43.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Sebastian Harl , Marc Fournier , Bernd Zeimetz Build-Depends: debhelper-compat (= 10), dpkg-dev (>= 1.14.10), po-debconf, dh-strip-nondeterminism, dh-autoreconf, bison, flex, autotools-dev, libltdl-dev, pkg-config, - default-libmysqlclient-dev, + default-libmysqlclient-dev [!kfreebsd-i386 !kfreebsd-amd64], intel-cmt-cat [amd64 i386], libiptc-dev (>= 1.8.4-2) [linux-any] | libip4tc-dev [linux-any] | iptables-dev (>= 1.4.3.2-2) [linux-any], libiptc-dev (>= 1.8.4-2) [linux-any] | libip6tc-dev [linux-any] | iptables-dev (>= 1.4.3.2-2) [linux-any], @@ -24,7 +24,7 @@ libgrpc++-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x], libgps-dev, libhiredis-dev, - libi2c-dev (>= 4.0~), + libi2c-dev (>= 4.0~) [!hurd-i386], libkvm-dev [kfreebsd-any], libldap2-dev, liblua5.3-dev, @@ -51,8 +51,8 @@ libudev-dev [linux-any], libupsclient-dev | libupsclient1-dev, libvarnishapi-dev, - libvirt-dev (>= 0.4.0-6) [linux-any], - libxen-dev [amd64 arm64 armhf i386], + libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64 !sh4 !ia64 !alpha], + libxen-dev [amd64 arm64 armhf], libxml2-dev, libyajl-dev, linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any], diff -Nru collectd-5.12.0/debian/po/templates.pot collectd-5.12.0/debian/po/templates.pot --- collectd-5.12.0/debian/po/templates.pot 2022-01-20 14:40:42.000000000 +0000 +++ collectd-5.12.0/debian/po/templates.pot 2022-02-22 00:17:43.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: collectd\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2022-01-20 15:42+0100\n" +"POT-Creation-Date: 2022-02-22 01:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru collectd-5.12.0/debian/rules collectd-5.12.0/debian/rules --- collectd-5.12.0/debian/rules 2022-01-20 14:40:42.000000000 +0000 +++ collectd-5.12.0/debian/rules 2022-02-22 00:17:43.000000000 +0000 @@ -195,7 +195,32 @@ confflags += \ --disable-gmond \ --disable-virt \ - --disable-java + --disable-java \ + --disable-mysql +endif + +# Missing build-deps on sh4 +ifeq ($(DEB_HOST_ARCH_OS),sh4) + confflags += \ + --disable-virt +endif + +# Missing build-deps on ia64 +ifeq ($(DEB_HOST_ARCH_OS),ia64) + confflags += \ + --disable-virt +endif + +# Missing build-deps on alpha +ifeq ($(DEB_HOST_ARCH_OS),alpha) + confflags += \ + --disable-virt +endif + +# Missing build-deps on hurd +ifeq ($(DEB_HOST_ARCH_OS),hurd-i386) + confflags += \ + --disable-barometer endif # These plugins are Intel-hardware specific. @@ -217,7 +242,7 @@ endif # This plugin is x86 and arm specific. -ifeq (,$(filter amd64 arm64 armhf i386, $(DEB_HOST_ARCH))) +ifeq (,$(filter amd64 arm64 armhf, $(DEB_HOST_ARCH))) confflags += \ --disable-xencpu endif