Merge tag 'collectd-3.10.1-3' into collectd-3.10.1-2bpo.

diff --cc debian/changelog
index e742802cde7675ef5372689cb0beccd5fff219c3,e9f482430b18998de1eff647957028ea4e6fe772..ba37047b1e1167afb92afe53b0d946503e9c5c94
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,26 +1,33 @@@
+ collectd (3.10.1-3) unstable; urgency=low
+ 
+   * Added --oknodo to start-stop-daemon in the init script (Closes: #379703).
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Tue, 25 Jul 2006 18:34:55 +0200
+ 
+ collectd (3.10.1-2) unstable; urgency=low
+ 
+   * Added collectd-dbg package.
+ 
+  -- Sebastian Harl <sh@tokkee.org>  Sun, 23 Jul 2006 23:39:42 +0200
+ 
+ collectd (3.10.1-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Dynamically link against external liboping.
+     - New binary package collectd-ping.
+     - Added collectd-ping to suggested packages.
+   * Moved config file from /usr/share/doc/collectd/examples/ to
+     /etc/collectd/.
+ 
+  -- 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 --cc debian/control
index fe68e65cfb4eb3c9191762d621b92cbbaefd7cd6,b9b84d548362785b8608e233a60882603eb6849a..a499c69e2fb7a5caebb1b3c7518ea4c26b177397
--- 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 (>= 4.0.0), autotools-dev, libcurl3-dev,
-  libmysqlclient14-dev, librrd2-dev, libsensors-dev
+ Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-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