Merge collectd-3.10.3-1 into bpo branch.

diff --git a/debian/changelog b/debian/changelog
index 3a5b56d17450ebac40c46f07f7a55475b4224f67..4209e55102fd5969d508fc59d20856b6b47e9845 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,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"
@@ -26,6 +32,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).
@@ -49,6 +62,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/control b/debian/control
index b49a8497769af8075840189dd2579ac156e5f17f..7eb9032263410c958716fc5b2a227e208b27d189 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
 Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev,
- libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev,
- libsensors-dev, liboping-dev (>= 0.3.3)
+ libmysqlclient14-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3)
 Standards-Version: 3.7.2
 
 Package: collectd