Merged branch 'v5.4.1'.

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 057d973e56e6fb335d33a635c7aab30d09ca5e4b..e155c1c7afdc43f3bc17aea9037c5bbd18fc70a4 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],
@@ -18,11 +17,12 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  liblvm2-dev [linux-any],
  libmemcached-dev,
  libmodbus-dev,
- libmnl-dev,
+ libmnl-dev [linux-any],
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
  liboping-dev (>= 0.3.3),
+ libow-dev,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
@@ -36,8 +36,8 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
  libtokyocabinet-dev [linux-any],
  libtokyotyrant-dev [linux-any],
- libupsclient1-dev,
- libvarnish-dev,
+ libupsclient-dev | libupsclient1-dev,
+# libvarnishapi-dev,
  libvirt-dev (>= 0.4.0-6) [linux-any],
  libxml2-dev,
  libyajl-dev,
@@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  protobuf-c-compiler,
  python-dev
 Build-Conflicts: libpthread-dev, libhal-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
 Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git