Merged branch 'unstable-nmu'.

[pkg-collectd.git] / debian / control

diff --git a/debian/control b/debian/control
index 8e1be0cb4081f4049f61a3ccc28f32d9942903f1..e66c4e8a296018ba7b03d5ee2e69684bffcdc646 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,11 +40,11 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  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
+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
@@ -224,7 +224,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.2~),
+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