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 1641fbffa8bcd75a020d7ca54e04e6540612a90d..c7d9763de00d22876305e69eda8e1de40ce82c55 100644 (file)
--- 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 a05694aaa0ce11ba5df14ed337327afb355d7958..54a207110b6a375228b0b5695cf387fcbd81dbb1 100644 (file)
--- 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 54bbabbf4ab4c9037839824fbb784bf6756dee49..75321eccf73eda7ce43f9483258277074bc7f8a6 100644 (file)
--- 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 46fdbf8232ae58fd3f050652734e830f1e58eef8..0a948cb40ddd32ffc4b2041996f4512a5e719fdd 100755 (executable)
--- 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