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

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 cb50bff..1a7da9f 100644
--- 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 aae7ba0..a3ed215 100644
--- 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 cfb5b0d..3310912 100644
--- 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 94a8045..2c484b3 100755
--- 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