patches: Removed collectd2html related patches -- applied upstream.

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 054cea90a05a67c249d3c725a560cf07421c8916..d90322055e48c67b2acacfc31311dd23010b2aa0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ 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 (>= 1.4~),
  libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64],
 # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
@@ -34,9 +35,10 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libyajl-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
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
 Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
@@ -85,6 +87,7 @@ Description: statistics collection and monitoring daemon (core system)
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
    * parse JSON files: curl_json
+   * parse XML data: curl_xml
    * query data from a relational database: dbi
    * disk space usage: df
    * disk and partition throughput: disk
@@ -126,6 +129,7 @@ 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
@@ -209,7 +213,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.10~),
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.11~),
  ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and