control, rules: Enabled the "tokyotyrant" plugin.

… except on kfreebsd-{i386,amd64} and build-depend on libtokyotyrant-dev
(which is not available on kfreebsd).

diff --git a/debian/changelog b/debian/changelog
index 1c9c6f512faea5d9622028fd6476e95d5afbacef..1138b5b89e240ee7a16ed3c97957b0b713fc88a4 100644 (file)
--- 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 <tokkee@debian.org>  Sat, 23 Jan 2010 22:50:15 +0100
+ -- Sebastian Harl <tokkee@debian.org>  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 6826b4b064215f9573555f80d66064fea1dc79c6..c0ae0850ba528ce42391cda3e760823e6cefa166 100644 (file)
--- 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 d273e78fbb61a6feb0f98c50a32294c49b2d61c8..2ddcaa0b07c133ea7ef5dfa9a0888a7147298903 100755 (executable)
--- 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