From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 22 Mar 2010 22:21:49 +0000 (+0100)
Subject: collectd.conf, control, rules: Disabled the "rrdcached" plugin.
X-Git-Tag: collectd-4.9.1-2--bpo50+1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1070cbc24c223913fe46d3020f1a25de49f4473c;p=pkg-collectd.git

collectd.conf, control, rules: Disabled the "rrdcached" plugin.

This plugin requires rrdclient support in librrd; removed version from
librrd-dev build-dependency.
---

diff --git a/debian/changelog b/debian/changelog
index ba96b19..a1eba7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
       not available in Lenny; removed build-dependency on libganglia-dev.
     - Disabled the "memcachec" plugin, which requires libmemcached which is
       not available in Lenny; removed build-dependency on libmemcached-dev.
+    - Disabled the "rrdcached" plugin, which requires rrdclient support in
+      librrd; removed version from librrd-dev build-dependency.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:17:31 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:21:05 +0100
 
 collectd (4.9.1-2) unstable; urgency=low
 
diff --git a/debian/collectd.conf b/debian/collectd.conf
index 2cf0fff..c122ec7 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -80,7 +80,6 @@ LoadPlugin memory
 LoadPlugin processes
 #LoadPlugin protocols
 #LoadPlugin python
-#LoadPlugin rrdcached
 LoadPlugin rrdtool
 #LoadPlugin sensors
 #LoadPlugin serial
@@ -562,13 +561,6 @@ LoadPlugin users
 #	</Module>
 #</Plugin>
 
-#<Plugin rrdcached>
-#	DaemonAddress "unix:/var/run/rrdcached.sock"
-#	DataDir "/var/lib/rrdcached/db/collectd"
-#	CreateFiles true
-#	CollectStatistics true
-#</Plugin>
-
 <Plugin rrdtool>
 	DataDir "/var/lib/collectd/rrd"
 #	CacheTimeout 120
diff --git a/debian/control b/debian/control
index 15fea53..586c66c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- librrd-dev (>= 1.4~),
+ librrd-dev,
  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 acf63fb..294712a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,9 @@ 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
+
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms