control, rules: Enabled the "rrdcached" plugin.

… and build-depend on librrd-dev (>= 1.4~) (and removed the optional build-dep
on librrd2-dev).

diff --git a/debian/changelog b/debian/changelog
index 25b4c28d563bda41255484452eec28c1e99b4168..1c9c6f512faea5d9622028fd6476e95d5afbacef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,13 +32,15 @@ collectd (4.9.1-1) unstable; urgency=low
       + "gmond" plugin / libganglia1-dev
       + "libvirt" plugin / libvirt-dev
       + "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).
   * 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 18:38:40 +0000
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 23 Jan 2010 22:50:15 +0100
 
 collectd (4.8.2-1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 1aeb084bbf79212f81b66090c3752369196bca41..6826b4b064215f9573555f80d66064fea1dc79c6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- librrd-dev | librrd2-dev,
+ librrd-dev (>= 1.4~),
  libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64],
 # 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,

diff --git a/debian/rules b/debian/rules
index cb1e229a380471d7750833dee89cca08f9f61ea0..d273e78fbb61a6feb0f98c50a32294c49b2d61c8 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
 
-# rrdclient support in librrd is required for the rrdcached plugin.
-confflags += --disable-rrdcached
-
 # libtokyotyrant is required for the tokyotyrant plugin.
 confflags += --disable-tokyotyrant