Removed libdbi0-dev build-dependency and disabled the "dbi" plugin.

libdbi is not available on Etch.

diff --git a/debian/changelog b/debian/changelog
index 07d33d0cb99394900d810eada3ed1db534d24699..6a0366257d90a3e33c0d07915f948a3e35e80bcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ collectd (4.6.2-1~bpo40+1) etch-backports; urgency=low
   * Reenabled and fixed the work around for #474087 (broken openipmi .pc
     files) and removed the version from the libopenipmi-dev build dependency -
     Etch does not include a fixed version of openipmi.
+  * Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
+    libdbi is not available on Etch.
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 13 Apr 2009 21:40:09 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 13 Apr 2009 21:45:04 +0200
 
 collectd (4.6.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index d979cc5f55c5fccae1d7d86ec504292edff6e4c3..44827ae942b1b056b2c7a28b0098a90bc7571408 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), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-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], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev
+Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-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], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev
 Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.8.1
 Homepage: http://collectd.org/
@@ -44,7 +44,6 @@ Description: statistics collection and monitoring daemon
    * CPU frequency: cpufreq
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
-   * query data from a relational database: dbi
    * disk space usage: df
    * disk and partition throughput: disk
    * DNS traffic information: dns

diff --git a/debian/rules b/debian/rules
index 725af7154117d8c0e6037a1ab9f0752384a21707..2934963034e3fb90c6975b8da7d9868d574db97e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,9 @@ ifeq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386 powerpc))
        confflags += --disable-libvirt
 endif
 
+# libdbi is not available on Etch
+confflags += --disable-dbi
+
 # Force the inclusion of the ipmi plugin and manually specify its
 # dependencies to work around #474087 (broken openipmi .pc files).
 BUILD_WITH_OPENIPMI_LIBS = -lOpenIPMIpthread -lOpenIPMIutils -lOpenIPMI