control: Re-added libupsclient1-dev as alternate build-dep.

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 6763c94aa4c72a1efb6aceca15522f8a35599fef..2939a1452d36372e491059c4d2fbbb09a574e90b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ 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-any !hurd-any],
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,
  kfreebsd-kernel-headers [kfreebsd-any],
@@ -14,10 +13,11 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  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 [linux-any],
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -29,22 +29,23 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  librabbitmq-dev,
  librrd-dev (>= 1.4~),
  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 [linux-any],
  libtokyotyrant-dev [linux-any],
- libupsclient1-dev,
+ libupsclient-dev | libupsclient1-dev,
  libvarnish-dev,
  libvirt-dev (>= 0.4.0-6) [linux-any],
  libxml2-dev,
  libyajl-dev,
  linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
- openjdk-6-jdk [!hppa !kfreebsd-any !hurd-any],
+ default-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
  python-dev
-Build-Conflicts: libpthread-dev
-Standards-Version: 3.9.3
+Build-Conflicts: libpthread-dev, libhal-dev
+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
@@ -61,7 +62,7 @@ Suggests: collectd-dev,
  apache2, apcupsd, bind9, hddtemp, iptables, ipvsadm, lm-sensors, mbmon,
  memcached, mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
  pdns-server, postgresql, time-daemon,
- ${shlibs:Suggests}
+ ${shlibs:Suggests}, default-jre-headless
 Replaces: collectd (<< 4.8.2-1~)
 Description: statistics collection and monitoring daemon (core system)
  collectd is a small daemon which collects system information periodically and
@@ -87,6 +88,7 @@ Description: statistics collection and monitoring daemon (core system)
    * 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
@@ -116,6 +118,7 @@ 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
@@ -149,10 +152,12 @@ 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
@@ -167,12 +172,14 @@ Description: statistics collection and monitoring daemon (core system)
    * 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
 Depends: collectd-core, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${shlibs:Recommends}
+Recommends: ${shlibs:Recommends}, default-jre-headless
 Description: statistics collection and monitoring daemon
  collectd is a small daemon which collects system information periodically and
  provides mechanisms to monitor and store the values in a variety of ways.
@@ -224,7 +231,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.3~),
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.5~),
  ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and
@@ -240,6 +247,8 @@ Package: libcollectdclient-dev
 Section: libdevel
 Architecture: any
 Depends: libcollectdclient1 (= ${binary:Version}), ${misc:Depends}
+Replaces: collectd-dev (<< 5.2.0-1)
+Breaks: collectd-dev (<< 5.2.0-1)
 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