Merged commit 'collectd-4.10.1-1' into lenny-backports.

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 1fb6d822be372965737321c0ec95fb7d5d6dc2aa..54bbabbf4ab4c9037839824fbb784bf6756dee49 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,14 @@ Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
- bison, flex, autotools-dev, libltdl-dev, pkg-config,
+ bison, flex, autotools-dev, libltdl3-dev, pkg-config,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64],
- iptables-dev (>= 1.4.3.2-2) [!kfreebsd-i386 !kfreebsd-amd64],
  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,
- libmemcached-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -22,22 +19,17 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  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~))
- libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
- libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
- libtokyocabinet-dev [!kfreebsd-i386 !kfreebsd-amd64],
- libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ librrd-dev,
+ libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ libsnmp-dev | libsnmp9-dev,
  libupsclient1-dev,
  libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64],
  libxml2-dev,
- 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
+Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.9.1
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
@@ -86,7 +78,6 @@ Description: statistics collection and monitoring daemon (core system)
    * CPU frequency: cpufreq
    * 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
@@ -98,7 +89,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
@@ -111,7 +101,6 @@ Description: statistics collection and monitoring daemon (core system)
    * logging to files, STDOUT and STDERR: logfile
    * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon
-   * Query and parse data from a memcache daemon: memcachec
    * statistics of the memcached distributed caching system: memcached
    * memory usage: memory
    * statistics from mon.itor.us: Monitorus (Perl based plugin)
@@ -136,7 +125,6 @@ Description: statistics collection and monitoring daemon (core system)
    * number of processes: processes
    * information about network protocols: protocols
    * embedded Python interpreter: python
-   * write data via the RRD accelerator daemon: rrdcached
    * output to RRD files: rrdtool
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
@@ -149,7 +137,6 @@ Description: statistics collection and monitoring daemon (core system)
    * TeamSpeak2 server statistics: teamspeak2
    * power consumption measurements from "The Energy Detective" (TED): ted
    * Linux ACPI thermal zone information: thermal
-   * Tokyo Tyrant server statistics: tokyotyrant
    * external runtime interface: unixsock
    * system uptime: uptime
    * number of users logged into the system: users