From 10b68814722bfcb09d484b5ef306878c863a235e Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 8 Oct 2015 10:14:14 +0200 Subject: [PATCH] disable plugins for which build-deps aren't met in wheezy --- debian/changelog | 5 +++++ debian/control | 11 ++++++----- debian/rules | 9 +++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ba4b05..04b3d64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ collectd (5.5.0-3~bpo7+1) wheezy-backports-sloppy; urgency=medium * debian/rules, debian/control: - remove references to systemd and strip-nondeterminism, which were introduced in jessie. + - disable building sigrok, turbostat and write_kafka plugins, as the + required build-dependencies aren't available in wheezy. + - build uuid plugin against libhal, as this lib is still available on + wheezy. + - adjust libprotobuf build-dependency name. -- Marc Fournier Thu, 08 Oct 2015 08:26:10 +0200 diff --git a/debian/control b/debian/control index 6e36bdf..fc94c72 100644 --- a/debian/control +++ b/debian/control @@ -9,13 +9,14 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, javahelper, kfreebsd-kernel-headers [kfreebsd-any], libatasmart-dev [linux-any], - libcap-dev [linux-any], +# libcap-dev [linux-any], libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libdbi0-dev, libesmtp-dev, libganglia1-dev (>= 3) [linux-any], libgcrypt11-dev, libglib2.0-dev, + libhal-dev, libhiredis-dev, libi2c-dev, libkvm-dev [kfreebsd-any], @@ -32,12 +33,12 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, libpcap0.8-dev | libpcap-dev, libperl-dev, libpq-dev, - libprotobuf-c-dev, - librdkafka-dev, + libprotobuf-c0-dev, +# librdkafka-dev, librabbitmq-dev, librrd-dev (>= 1.4~), libsensors4-dev [linux-any], - libsigrok-dev (>= 0.2~), +# libsigrok-dev (>= 0.2~), # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~)) libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev, libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~), @@ -53,7 +54,7 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64], protobuf-c-compiler, python-dev -Build-Conflicts: libpthread-dev, libhal-dev +Build-Conflicts: libpthread-dev Standards-Version: 3.9.6 Homepage: http://collectd.org/ Vcs-Git: git://git.tokkee.org/pkg-collectd.git diff --git a/debian/rules b/debian/rules index e22b2a8..ed39454 100755 --- a/debian/rules +++ b/debian/rules @@ -85,9 +85,18 @@ confflags += --disable-oracle # librouteros is required for the routeros plugin. confflags += --disable-routeros +# libsigrok >= 0.2.0 is required for the sigrok plugin +confflags += --disable-sigrok + +# linux-libc-dev >= 3.13 is required for the turbostat plugin. +confflags += --disable-turbostat + # libmongoc is required for the write_mongodb plugin. confflags += --disable-write_mongodb +# librdkafka is required for the write_kafka plugin. +confflags += --disable-write_kafka + # xmms1 is required for the xmms plugin. confflags += --disable-xmms -- 2.30.2