From cca71db2f49a37d2e07d7f82f06635619a1f4c48 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 29 Mar 2008 12:33:13 +0100 Subject: [PATCH] Reverted "Added libsensors4-dev as option to the libsensors-dev build dependency." libsnmp-dev depends on libsensors-dev and libsensors4-dev conflicts with libsensors-dev. To not confuse the buildds, I've thus removed libsensors4-dev from the build dependencies. This reverts commit 7fff6c752cc6100025af0967e86d900501c42cdc. --- debian/changelog | 1 - debian/control | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54f9ed7..dba3786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,6 @@ collectd (4.3.2-1) unstable; urgency=low - fr.po, thanks to Florent Usseil (Closes: #468813). - pt.po, thanks to Américo Monteiro (Closes: #469745, #472183). * collectd.init.d: Consider the DISABLE option only when starting collectd. - * Added libsensors4-dev as option to the libsensors-dev build dependency. * Disabled iptables plugin - libiptc is no longer available on Debian. -- Sebastian Harl Sat, 29 Mar 2008 12:23:12 +0100 diff --git a/debian/control b/debian/control index da0937f..e6f1ad4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors4-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 +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl4-gnutls-dev | 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 Build-Conflicts: libpthread-dev Standards-Version: 3.7.3 Homepage: http://collectd.org/ -- 2.30.2