Merged branch 'squeeze' into lenny-backports.

diff --cc debian/changelog
index 6e6be0213ee6565d47010d140c5983599f15ede4,214599b58b82d86d6b57f4fd3186069dcc7166c5..a5aab6e364bdf18fc111b3fcfb10ff532f62c3e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,22 +1,53 @@@
+ collectd (4.10.1-1+squeeze1) testing-proposed-updates; urgency=medium
+ 
+   * debian/rules:
+     - Added support for ‘powerpcspe’ to the Java arch mapping; thanks to
+       Sebastian Andrzej Siewior for the patch (Closes: #592909).
+   * debian/patches:
+     - Added bts595756-notify_email-segfault -- upstream patch fixing a
+       segfault in the 'notify_email' plugin; thanks to Manuel CISSE for
+       reporting this (Closes: #595756).
+     - Added bts592623-curl_json-file -- upstream patch fixing access to
+       file:// URLs in the 'curl_json' plugin; thanks Baptiste Mille-Mathias
+       for reporting this and pointing out the patch (Closes: #592623).
+     - Added bts596128-reheap-fix -- upstream patch fixing the 'reheap()'
+       function used to manage the "read" callbacks and making sure all plugins
+       get executed correctly and in each interval (Closes: #596128).
+   * Set urgency to "medium" because of the RC bug-fix.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Sun, 12 Sep 2010 13:53:37 +0200
+ 
 +collectd (4.10.1-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +  * debian/control:
 +    - Build-conflict with iptables-dev to force the use of the shipped libiptc
 +      (this allows building the iptables plugin on all architectures).
 +    - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is
 +      not available in Lenny.
 +    - Build-depend on libsensors-dev, rather than libsensors4-dev, which is
 +      not available in Lenny. This limits the functionality of the "sensors"
 +      plugin which does not work well with libsensors3 and lm-sensors-3
 +      (Re-opens: #538795).
 +    - Build-depend on "libsnmp-dev | libsnmp9-dev" rather than specifying the
 +      right combination of libsnmp-dev and perl, which might confuse buildds
 +      on Lenny. Lenny is not affected by #559087 (see 4.8.2-1).
 +  * debian/collectd.conf, debian/control, debian/rules:
 +    - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is
 +      not available in Lenny; removed build-dependency on libganglia-dev.
 +    - Disabled the "memcachec" plugin, which requires libmemcached which is
 +      not available in Lenny; removed build-dependency on libmemcached-dev.
 +    - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
 +      is not available in Lenny; removed libtokyocabinet-dev and
 +      libtokyotyrant-dev build-dependencies.
 +    - Disabled the "curl_json" plugin, which requires libyajl which is not
 +      available in Lenny; removed libyajl-dev build-dependency.
 +    - Disabled the "pinba" plugin, which requires protobuf which is not
 +      available in Lenny; removed libprotobuf-c0-dev and protobuf-c-compiler
 +      build-dependencies.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Fri, 10 Sep 2010 22:29:17 +0200
 +
  collectd (4.10.1-1) unstable; urgency=low
  
    * New upstream release.

diff --cc debian/rules
Simple merge