Merged branch 'experimental' into debmon-squeeze

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 251ccf9ed7d795e8172cf8cefc32673534ebda64..cd99cc3b3dcd539914e1ff6e81d614dffa4e51c7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  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,
@@ -24,7 +25,6 @@ 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 [linux-any],
 # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
@@ -79,7 +79,6 @@ 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
@@ -200,6 +199,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
@@ -208,7 +208,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.
@@ -220,7 +220,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
@@ -235,7 +235,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
@@ -245,7 +245,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}