Added (<< 2.6.25-1) as an option to the existing linux-libc-dev build dep.

Those versions are not affected by #479899.

diff --git a/debian/changelog b/debian/changelog
index f8fad9edd74c1e3bc1b60350c3b2f571a8ecfc2c..5304fdac16ffd8a1007a7b17998d49a196aa2196 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ collectd (4.4.1-2) UNRELEASED; urgency=low
 
   * Restrict libcurl4-gnutls-dev build dependency to versions which are not
     affected by #488701 (Closes: #489091).
+  * Added linux-libc-dev (<< 2.6.25-1) as an option to the linux-libc-dev
+    (>= 2.6.25-4) build dependency - those versions are not affected by
+    #479899.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 07 Jul 2008 15:12:22 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 07 Jul 2008 15:21:30 +0200
 
 collectd (4.4.1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 8a96746a0f3f6d48f41cd91d3b5c0ae8684853f4..8e52f584d66b6c8ee3ed7b129291b3de7a170376 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, linux-libc-dev (>= 2.6.25-4), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.8.0
 Homepage: http://collectd.org/