From 1480aa4611661ff5b08ecd91a2a8ebe9b91c23a8 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 23 Jan 2010 23:12:21 +0100 Subject: [PATCH] control, rules: Enabled the "tokyotyrant" plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … except on kfreebsd-{i386,amd64} and build-depend on libtokyotyrant-dev (which is not available on kfreebsd). --- debian/changelog | 4 +++- debian/control | 1 + debian/rules | 4 +--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c9c6f5..1138b5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,13 +34,15 @@ collectd (4.9.1-1) unstable; urgency=low + "java" plugin / openjdk6-jdk - Enabled the "rrdcached" plugin and build-depend on librrd-dev (>= 1.4~) (and removed the optional build-dep on librrd2-dev). + - Enabled the "tokyotyrant" plugin (except on kfreebsd-{i386,amd64}) and + build-depend on libtokyotyrant-dev (which is not available on kfreebsd). * debian/rules: - Disabled the following plugins on kfreebsd-{i386,amd64} which have not yet been ported to FreeBSD: battery, conntrack, contextswitch, cpufreq, disk, entropy, fscache, irq, madwifi, nfs, protocols, serial, thermal, vmem, vserver, wireless. - -- Sebastian Harl Sat, 23 Jan 2010 22:50:15 +0100 + -- Sebastian Harl Sat, 23 Jan 2010 23:11:19 +0100 collectd (4.8.2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 6826b4b..c0ae085 100644 --- a/debian/control +++ b/debian/control @@ -26,6 +26,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, # 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~), + libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64], libupsclient1-dev, libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64], libxml2-dev, diff --git a/debian/rules b/debian/rules index d273e78..2ddcaa0 100755 --- a/debian/rules +++ b/debian/rules @@ -73,9 +73,6 @@ confflags += --disable-oracle # librouteros is required for the routeros plugin. confflags += --disable-routeros -# libtokyotyrant is required for the tokyotyrant plugin. -confflags += --disable-tokyotyrant - # xmms1 is required for the xmms plugin. confflags += --disable-xmms @@ -123,6 +120,7 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64)) confflags += \ --disable-gmond \ --disable-libvirt \ + --disable-tokyotyrant \ --disable-java endif -- 2.30.2