X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Fcontrol;h=fa5042b83611898e0e7d41eadae028c8b3d04ab0;hb=f049dd18b69441d8937ec7569fc43028d901b58b;hp=f70f756463ee2c874cc4ddaa069274fd12833ab2;hpb=e0686fba23bf1a76aa37efb828ab3acbbbcf9cc9;p=pkg-collectd.git

diff --git a/debian/control b/debian/control
index f70f756..fa5042b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,22 @@ 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,
- iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64],
- iptables-dev (>= 1.4.3.2-2) [!kfreebsd-i386 !kfreebsd-amd64],
+ iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-any !hurd-any],
+ iptables-dev (>= 1.4.3.2-2) [linux-any],
+ javahelper,
+ kfreebsd-kernel-headers [kfreebsd-any],
  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],
+ libganglia1-dev (>= 3) [linux-any],
  libgcrypt11-dev,
  libglib2.0-dev,
  libhal-dev,
+ libkvm-dev [kfreebsd-any],
+ liblvm2-dev [linux-any],
  libmemcached-dev,
  libmodbus-dev,
+ libmnl-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -23,23 +28,26 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libperl-dev,
  libpq-dev,
  libprotobuf-c0-dev,
+ librabbitmq-dev,
  librrd-dev (>= 1.4~),
- libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ libsensors4-dev [linux-any],
+# libsigrok-dev (>= 0.2~),
 # 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],
+ libtokyocabinet-dev [linux-any],
+ libtokyotyrant-dev [linux-any],
  libupsclient1-dev,
- libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64],
+ libvarnish-dev,
+ libvirt-dev (>= 0.4.0-6) [linux-any],
  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],
+ linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
+ default-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
  python-dev
 Build-Conflicts: libpthread-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
 Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
@@ -76,11 +84,13 @@ Description: statistics collection and monitoring daemon (core system)
  default configuration) on top of it without having to modify the "collectd"
  package.
  .
+   * AMQP output plugin: amqp
    * Apache and lighttpd statistics provided by mod_status: apache
    * APC UPS's charge, load, input/output/battery voltage, etc.: apcups
    * Ascent server statistics: ascent
    * battery status: battery
    * bind9 name-server and zone statistics: bind
+   * CGroups resource usage: cgroups
    * connection tracking table size: conntrack
    * number of context switches done by the operating system: contextswitch
    * CPU utilization: cpu
@@ -110,11 +120,13 @@ Description: statistics collection and monitoring daemon (core system)
    * CPU, disk, network statistics of guest systems: libvirt
    * system load averages: load
    * logging to files, STDOUT and STDERR: logfile
+   * Logical Volume Manager usage: lvm
    * 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
+   * read values from Modbus/TCP enabled devices: modbus
    * statistics from mon.itor.us: Monitorus (Perl based plugin)
    * multimeter statistics: multimeter
    * MySQL statistics provided by MySQL's "show status" command: mysql
@@ -142,23 +154,29 @@ Description: statistics collection and monitoring daemon (core system)
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
    * values from SNMP enabled network devices: snmp
+   * aggregate values received with the StatsD protocol: statsd
    * swap usage: swap
    * logging to syslog: syslog
    * parse table-like structured files: table
    * incremental parsing of logfiles: tail
+   * incremental parsing of CSV files: tail_csv
    * number of TCP connections to specific ports: tcpconns
    * TeamSpeak2 server statistics: teamspeak2
    * power consumption measurements from "The Energy Detective" (TED): ted
    * Linux ACPI thermal zone information: thermal
+   * Check thresholds and for missing values: threshold
    * Tokyo Tyrant server statistics: tokyotyrant
    * external runtime interface: unixsock
    * system uptime: uptime
    * number of users logged into the system: users
    * set the hostname to an unique identifier: uuid
+   * Varnish HTTP accelerator daemon statistics: varnish
    * detailed virtual memory statistics: vmem
    * system resources used by Linux-VServers: vserver
    * wireless network stats: wireless
+   * send collected values to a graphite server: write_graphite
    * send collected values to a web-server: write_http
+   * send collected values to a riemann server: write_riemann
 
 Package: collectd
 Architecture: any
@@ -194,6 +212,7 @@ Description: statistics collection and monitoring daemon (utilities)
  .
  This package contains the following utility:
  .
+   * collectdctl: Control interface for collectd
    * collectd-nagios: Nagios plugin for querying collectd
 
 Package: collectd-dbg
@@ -202,7 +221,7 @@ Architecture: any
 Priority: extra
 Depends: collectd-core (= ${binary:Version}), ${misc:Depends}
 Recommends: collectd-utils (= ${binary:Version}),
- libcollectdclient0 (= ${binary:Version})
+ libcollectdclient1 (= ${binary:Version})
 Description: statistics collection and monitoring daemon (debugging symbols)
  collectd is a small daemon which collects system information periodically and
  provides mechanisms to monitor and store the values in a variety of ways.
@@ -214,7 +233,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.11~),
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.3~),
  ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and
@@ -229,7 +248,7 @@ Description: statistics collection and monitoring daemon (development files)
 Package: libcollectdclient-dev
 Section: libdevel
 Architecture: any
-Depends: libcollectdclient0 (= ${binary:Version}), ${misc:Depends}
+Depends: libcollectdclient1 (= ${binary:Version}), ${misc:Depends}
 Description: client library for collectd's control interface (development files)
  libcollectdclient provides an API to access the control interface provided by
  the unixsock plugin of collectd, a statistics collection and monitoring
@@ -239,7 +258,7 @@ Description: client library for collectd's control interface (development files)
  .
  This package contains the header files and the static library.
 
-Package: libcollectdclient0
+Package: libcollectdclient1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}