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

This plugin requires libganglia (>= 3) which is not available in Lenny;
removed build-dependency on libganglia-dev.

diff --git a/debian/changelog b/debian/changelog
index cb50bff7805af767cc7e39ef9f5e2e5f3d8976a3..1a7da9f93de28342e23e1591474aee8762a86589 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,12 @@ collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
     - Build-conflict with iptables-dev to force the use of the shipped libiptc
       (this allows building the iptables plugin on all architectures).
     - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is
-      not available on Lenny.
+      not available in Lenny.
+  * 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.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:10:51 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:14:11 +0100
 
 collectd (4.9.1-2) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index aae7ba0305ffd34856c074083b2e99f2db86dc71..a3ed21598e12f0fd8c2b5b13675842a49568486b 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -48,7 +48,6 @@ LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin filecount
 #LoadPlugin fscache
-#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipmi
@@ -281,22 +280,6 @@ LoadPlugin users
 #      </Directory>
 #</Plugin>
 
-#<Plugin gmond>
-#      MCReceiveFrom "239.2.11.71" "8649"
-#
-#      <Metric "swap_total">
-#              Type "swap"
-#              TypeInstance "total"
-#              DataSource "value"
-#      </Metric>
-#
-#      <Metric "swap_free">
-#              Type "swap"
-#              TypeInstance "free"
-#              DataSource "value"
-#      </Metric>
-#</Plugin>
-
 #<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port 7634

diff --git a/debian/control b/debian/control
index cfb5b0d5b82e0481fb0780f7a7b9ee0f99147a53..331091203b7876f01024046c906826edfbc7e9f5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdbi0-dev,
  libesmtp-dev,
- libganglia1-dev (>= 3) [!kfreebsd-i386 !kfreebsd-amd64],
  libgcrypt11-dev,
  libglib2.0-dev,
  libhal-dev,
@@ -93,7 +92,6 @@ Description: statistics collection and monitoring daemon (core system)
    * count the number of files in directories: filecount
    * Linux file-system based caching framework statistics: fscache
    * query data from Java processes using JMX: GenericJMX (Java based plugin)
-   * Receive and interpret Ganglia multicast traffic: gmond
    * harddisk temperature: hddtemp
    * network traffic: interface
    * IPMI sensors information: ipmi

diff --git a/debian/rules b/debian/rules
index 94a80455f49d6eaa4b8212a05a2693b9d5228db6..2c484b3b06d2c0eacad36e1035803aa0850787a9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,9 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
+# libganglia >= 3 is required for the gmond plugin.
+confflags += --disable-gmond
+
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp