From a6de55a8d13e8563e5a5cf366f22963242a3fdef Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 30 Jun 2015 09:01:21 +0200 Subject: [PATCH] enable existing but disabled plugins --- debian/changelog | 8 ++++++++ debian/control | 5 +++-- debian/rules | 13 ------------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 125a24d..fbb8735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,14 @@ collectd (5.5.0-1) UNRELEASED; urgency=medium - Removed myplugin_api.dpatch; merged upstream. * debian/collectd-dev.install, myplugin_includes.dpatch: - Update path to header files moved to daemon/ subdirectory upstream. + * debian/rules, debian/control: + - Enable redis, write_redis plugins and add Build-depend on + libhiredis-dev (previous versions depended on credis which wasn't + packaged in Debian). + - Enable sigrok and uncomment Build-depend on libsigrok-dev. + - Re-enable varnish and uncomment Build-depend on libvarnishapi-dev + (support for varnish 4.x was added upstream). + - Enable zfs_arc (support for ZFS on linux was added upstream). -- Marc Fournier Tue, 30 Jun 2015 07:08:39 +0200 diff --git a/debian/control b/debian/control index 5aec6a6..1b3c3c9 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libganglia1-dev (>= 3) [linux-any], libgcrypt11-dev, libglib2.0-dev, + libhiredis-dev, libkvm-dev [kfreebsd-any], liblvm2-dev [linux-any], libmemcached-dev, @@ -30,14 +31,14 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, 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~), libtokyocabinet-dev [linux-any], libtokyotyrant-dev [linux-any], libupsclient-dev | libupsclient1-dev, -# libvarnishapi-dev, + libvarnishapi-dev, libvirt-dev (>= 0.4.0-6) [linux-any], libxml2-dev, libyajl-dev, diff --git a/debian/rules b/debian/rules index b0dd9fd..c5ca9dd 100755 --- a/debian/rules +++ b/debian/rules @@ -83,28 +83,15 @@ confflags += --disable-netapp # libclntsh is required for the oracle plugin. confflags += --disable-oracle -# libcredis is required for the *redis plugins. -confflags += --disable-redis --disable-write_redis - # librouteros is required for the routeros plugin. confflags += --disable-routeros -# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon -confflags += --disable-sigrok - -# varnish does not currently work with varnish4 -# (c.f. https://bugs.debian.org/745902) -confflags += --disable-varnish - # libmongoc is required for the write_mongodb plugin. confflags += --disable-write_mongodb # xmms1 is required for the xmms plugin. confflags += --disable-xmms -# libkstat is required for the xfs_arc plugin. -confflags += --disable-zfs-arc - # These plugins are Linux-specific. ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) confflags += \ -- 2.30.2