Merge branch 'master' into wheezy-backports-sloppy

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 0ffd81adb21cf3f130ba3c244a8eef4ce250b2cc..e8406b260050518db500da36aac1f7d4a083977d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
 Uploaders: Marc Fournier <marc@bl.uem.li>
-Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, dh-autoreconf,
+Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf, dh-autoreconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  default-libmysqlclient-dev,
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,
  kfreebsd-kernel-headers [kfreebsd-any],
  libatasmart-dev [linux-any],
- libcap-dev [linux-any],
+# libcap-dev [linux-any],
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdevstat-dev [kfreebsd-any],
  libdbi0-dev,
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libgcrypt20-dev,
  libglib2.0-dev,
  libgps-dev,
+ libhal-dev,
  libhiredis-dev,
  libi2c-dev,
  libkvm-dev [kfreebsd-any],
@@ -39,13 +40,14 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- libprotobuf-c-dev,
+ libprotobuf-c0-dev,
+# librdkafka-dev,
  librabbitmq-dev,
  librdkafka-dev,
  libriemann-client-dev,
  librrd-dev (>= 1.4~),
  libsensors4-dev [linux-any],
- libsigrok-dev (>= 0.2~) [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~),
@@ -61,9 +63,8 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
  default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
- python-dev,
- riemann-c-client
-Build-Conflicts: libpthread-dev, libhal-dev
+ python-dev
+Build-Conflicts: libpthread-dev
 Standards-Version: 3.9.8
 Homepage: https://collectd.org/
 Vcs-Git: https://github.com/collectd/pkg-debian.git