Merged commit 'collectd-4.4.1-2' into etch-backports.

diff --git a/debian/changelog b/debian/changelog
index 64520682948089e119490672d7c7d6ffb452138f..717b0b7ce8df08632feac7f4ac3625dd651d36cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,19 @@ collectd (4.4.1-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Tue, 17 Jun 2008 10:35:51 +0200
 
+collectd (4.3.2-1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Removed version from libvirt-dev build-dependency - a version with Xen
+    support is currently not available on backports.org.
+  * Reenabled the "iptables" plugin - libiptc is available in Etch.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Apr 2008 16:48:59 +0200
+
 collectd (4.3.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -65,6 +78,18 @@ collectd (4.3.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Mon, 31 Mar 2008 12:13:18 +0200
 
+collectd (4.3.0-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Removed version from libvirt-dev build-dependency - a version with Xen
+    support is currently not available on backports.org.
+
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 27 Mar 2008 13:13:13 +0100
+
 collectd (4.3.0-2) unstable; urgency=low
 
   * Added "lm-sensors" to the recommended packages and README.Debian.plugins
@@ -279,6 +304,12 @@ collectd (3.10.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri,  3 Nov 2006 15:18:17 +0000
 
+collectd (3.10.1-4~bpo.1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 22 Oct 2006 10:50:22 +0000
+
 collectd (3.10.1-4) unstable; urgency=low
 
   * Changed collectd-dbg's section and priority to "devel" and "extra"
@@ -288,6 +319,13 @@ collectd (3.10.1-4) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Thu,  5 Oct 2006 10:25:07 +0000
 
+collectd (3.10.1-2bpo1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+  * Forcing the use of libmysqlclient14 and librrd2.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun,  6 Aug 2006 14:17:57 +0200
+
 collectd (3.10.1-3) unstable; urgency=low
 
   * Added --oknodo to start-stop-daemon in the init script (Closes: #379703).
@@ -311,6 +349,13 @@ collectd (3.10.1-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Sat, 22 Jul 2006 21:43:37 +0200
 
+collectd (3.10.0-0bpo1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+  * Forcing the use of libmysqlclient14 and librrd2.
+
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 21 Jul 2006 16:23:53 +0200
+
 collectd (3.10.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/collectd.overrides b/debian/collectd.overrides
index 9350ff0865b305d7b97370fff09c1ec7e56d2c05..5208c6a58d5bcc5025db1bcefdb3a512f81e8703 100644 (file)
--- a/debian/collectd.overrides
+++ b/debian/collectd.overrides
@@ -1,4 +1,5 @@
 collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so
+collectd: shlib-with-non-pic-code usr/lib/collectd/iptables.so
 collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so
 collectd: spelling-error-in-description mysql MySQL
 

diff --git a/debian/control b/debian/control
index ea5738ee69ca135855255e533125cd42165440f8..e2adb00dd08653969e1cf813b767b16a7f8b3bc4 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, pkg-config, 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, libupsclient1-dev, 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), po-debconf, dpatch, bison | byacc, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.8.0
 Homepage: http://collectd.org/