Reenabled memcachec plugin.

libmemcached is now available in testing / unstable.

diff --git a/debian/changelog b/debian/changelog
index c02aacda2fb659176eeac816b1e707b9100b97c4..17b448c643141780672a0bedba8252a40b807ea4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,7 @@ collectd (4.7.0-1) unstable; urgency=low
     - Receive and interpret Ganglia multicast traffic: gmond (disabled in
       Debian, libganglia >= 3 is required)
     - Embedded Java Virtual Machine: java
-    - Query and parse data from a memcache daemon: memcachec (disabled in
-      Debian, libmemcached is not available)
+    - Query and parse data from a memcache daemon: memcachec
     - Information about network protocols: protocols
     - Parse table-like structured files: table
     - Power consumption measurements from "The Energy Detective" (TED): ted
@@ -18,7 +17,7 @@ collectd (4.7.0-1) unstable; urgency=low
     - Pass CPPFLAGS and CFLAGS as arguments to configure instead of setting
       them in the environment - this is the recommended way.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Jun 2009 18:46:26 +0200
 
 collectd (4.6.3-1) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 8b5ca60e444aa033d6c5a9429a81fa4f28bcddaa..5597d49f1efe802a18948ce10e6b1304d006755f 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -56,6 +56,7 @@ LoadPlugin irq
 #LoadPlugin libvirt
 LoadPlugin load
 #LoadPlugin mbmon
+#LoadPlugin memcachec
 #LoadPlugin memcached
 LoadPlugin memory
 #LoadPlugin multimeter
@@ -281,6 +282,19 @@ LoadPlugin users
 #      Port 411
 #</Plugin>
 
+#<Plugin memcachec>
+#      <Page "plugin_instance">
+#              Server "localhost"
+#              Key "page_key"
+#              <Match>
+#                      Regex "(\\d+) bytes sent"
+#                      DSType CounterAdd
+#                      Type "ipt_octets"
+#                      Instance "type_instance"
+#              </Match>
+#      </Page>
+#</Plugin>
+
 #<Plugin memcached>
 #      Host "127.0.0.1"
 #      Port "11211"

diff --git a/debian/control b/debian/control
index e0582f8b9d00fdfc839d9e3cafa6806be23c2dce..31af514b5c0317d644b38fe899633ea4d5322f6e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.8.1
 Homepage: http://collectd.org/
@@ -65,6 +65,7 @@ Description: statistics collection and monitoring daemon
    * system load averages: load
    * logging to files, STDOUT and STDERR: logfile
    * 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 7ab0eb275964a277ac3b1f39bca6a3bdb28e3f72..6f97f9e179df55008a935c92186e55a6711b420a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,6 @@ 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
-
 # libowcapi is required for the onewire plugin.
 confflags += --disable-onewire