Merge collectd-3.10.3-1 into bpo branch.

diff --cc debian/changelog
index 06320f1e2955a97f5f352dd5f30ac8b611ea5ca2,3a5b56d17450ebac40c46f07f7a55475b4224f67..4209e55102fd5969d508fc59d20856b6b47e9845
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,22 +1,28 @@@
+ collectd (3.10.3-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Made package binNMUable:
+     - Upstream assures API backward compatibility only between patch releases.
+   * LSBized init script.
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Mon,  6 Nov 2006 13:09:28 +0000
+ 
+ collectd (3.10.2-1) unstable; urgency=low
+ 
+   * New upstream release.
+     - Retry connecting to remote host and database in ping and mysql plugins
+       respectively (Closes: #393742).
+   * Replaced libcurl3-dev build dependency with libcurl3-gnutls-dev to prevent
+     linking against libssl.
+ 
+  -- 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"

diff --cc debian/control
index 82598a38a9c09e63438f08bf7b7dc7c6bbcd14f3,b49a8497769af8075840189dd2579ac156e5f17f..7eb9032263410c958716fc5b2a227e208b27d189
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,8 -2,9 +2,8 @@@ Source: collect
  Section: utils
  Priority: optional
  Maintainer: Sebastian Harl <sh@tokkee.org>
- Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-dev,
-  libmysqlclient14-dev, librrd2-dev, libsensors-dev, liboping-dev (> 0.3.3)
+ 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