From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 10 Sep 2010 20:30:37 +0000 (+0200)
Subject: collectd.conf, control, rules: Disabled the "pinba" plugin.
X-Git-Tag: collectd-4.10.1-1--bpo50+1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55dc82388e0d68d6f764e340931165baefdfa33f;p=pkg-collectd.git

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

… which requires protobuf which is not available in Lenny; removed
libprotobuf-c0-dev and protobuf-c-compiler build-dependencies.
---

diff --git a/debian/changelog b/debian/changelog
index 1641fbf..c7d9763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,11 @@ collectd (4.10.1-1~bpo50+1) lenny-backports; urgency=low
       libtokyotyrant-dev build-dependencies.
     - Disabled the "curl_json" plugin, which requires libyajl which is not
       available in Lenny; removed libyajl-dev build-dependency.
+    - Disabled the "pinba" plugin, which requires protobuf which is not
+      available in Lenny; removed libprotobuf-c0-dev and protobuf-c-compiler
+      build-dependencies.
 
- -- Sebastian Harl <tokkee@debian.org>  Fri, 10 Sep 2010 22:23:04 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 10 Sep 2010 22:29:17 +0200
 
 collectd (4.10.1-1) unstable; urgency=low
 
diff --git a/debian/collectd.conf b/debian/collectd.conf
index a05694a..54a2071 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -76,7 +76,6 @@ LoadPlugin memory
 #LoadPlugin olsrd
 #LoadPlugin openvpn
 #LoadPlugin perl
-#LoadPlugin pinba
 #LoadPlugin ping
 #LoadPlugin postgresql
 #LoadPlugin powerdns
@@ -468,16 +467,6 @@ LoadPlugin users
 #	</Plugin>
 #</Plugin>
 
-#<Plugin pinba>
-#	Address "::0"
-#	Port "30002"
-#	<View "name">
-#		Host "host name"
-#		Server "server name"
-#		Script "script name"
-#	<View>
-#</Plugin>
-
 #<Plugin ping>
 #	Host "host.foo.bar"
 #	Host "host.baz.qux"
diff --git a/debian/control b/debian/control
index 54bbabb..75321ec 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- libprotobuf-c0-dev,
  librrd-dev,
  libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libsnmp-dev | libsnmp9-dev,
@@ -27,7 +26,6 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libxml2-dev,
  linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64],
  openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
- protobuf-c-compiler,
  python-dev
 Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.9.1
@@ -118,7 +116,6 @@ Description: statistics collection and monitoring daemon (core system)
    * OpenVPN traffic and compression statistics: openvpn
    * OpenVZ statistics: OpenVZ (Perl based plugin)
    * embedded Perl interpreter: perl
-   * timing values from Pinba: pinba
    * network latency statistics: ping
    * PostgreSQL database statistics: postgresql
    * PowerDNS name server statistics: powerdns
diff --git a/debian/rules b/debian/rules
index 46fdbf8..0a948cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,9 @@ confflags += --disable-onewire
 # libclntsh is required for the oracle plugin.
 confflags += --disable-oracle
 
+# protobuf is required for the pinba plugin.
+confflags += --disable-pinba
+
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros