From: Sebastian Harl Date: Mon, 22 Mar 2010 22:18:24 +0000 (+0100) Subject: collectd.conf, control, rules: Disabled the "memcachec" plugin. X-Git-Tag: collectd-4.9.1-2--bpo50+1~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3a47f76c14d44282ef9d114847be5d77ab6367c6;p=pkg-collectd.git collectd.conf, control, rules: Disabled the "memcachec" plugin. This plugin requires libmemcached which is not available in Lenny; removed build-dependency on libmemcached-dev. --- diff --git a/debian/changelog b/debian/changelog index 1a7da9f..ba96b19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low * debian/collectd.conf, debian/control, debian/rules: - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is 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. - -- Sebastian Harl Mon, 22 Mar 2010 23:14:11 +0100 + -- Sebastian Harl Mon, 22 Mar 2010 23:17:31 +0100 collectd (4.9.1-2) unstable; urgency=low diff --git a/debian/collectd.conf b/debian/collectd.conf index a3ed215..2cf0fff 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -59,7 +59,6 @@ LoadPlugin irq LoadPlugin load #LoadPlugin madwifi #LoadPlugin mbmon -#LoadPlugin memcachec #LoadPlugin memcached LoadPlugin memory #LoadPlugin multimeter @@ -347,19 +346,6 @@ LoadPlugin users # Port 411 # -# -# -# Server "localhost" -# Key "page_key" -# -# Regex "(\\d+) bytes sent" -# DSType CounterAdd -# Type "ipt_octets" -# Instance "type_instance" -# -# -# - # # Socket "/var/run/memcached.sock" # or: diff --git a/debian/control b/debian/control index 3310912..15fea53 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libgcrypt11-dev, libglib2.0-dev, libhal-dev, - libmemcached-dev, libmysqlclient-dev, libnotify-dev, libopenipmi-dev, @@ -104,7 +103,6 @@ Description: statistics collection and monitoring daemon (core system) * logging to files, STDOUT and STDERR: logfile * Atheros wireless LAN chipset statistics: madwifi * motherboard monitor: mbmon - * Query and parse data from a memcache daemon: memcachec * statistics of the memcached distributed caching system: memcached * memory usage: memory * multimeter statistics: multimeter diff --git a/debian/rules b/debian/rules index 2c484b3..acf63fb 100755 --- a/debian/rules +++ b/debian/rules @@ -64,6 +64,9 @@ confflags += --disable-apple_sensors --disable-tape # libganglia >= 3 is required for the gmond plugin. confflags += --disable-gmond +# libmemcached is required for the memcachec plugin. +confflags += --disable-memcachec + # libnetapp is required for the netapp plugin. confflags += --disable-netapp