Merged branch 'debmon-squeeze' into debmon-wheezy

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 81d4fe5813baebee5791c63292939ac7d2890aeb,2bdbc9d0db284e5f02bb0910f5dc616c542a9bcb..697fa837b7d4778949c1f9890068e669edee2e1f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,29 +1,37 @@@
+ collectd (5.2.0-2~debmon60+1) debmon-squeeze; urgency=low
+ 
+   * Rebuild for squeeze-backports.
+   * debian/rules:
+     - Re-enabled the netlink plugin (previously disabled for
+       squeeze-backports); the plugin should now build with older and current
+       versions of iproute2.
+   Changes kept from squeeze-backports:
+   * debian/rules, debian/control:
+     - Disabled modbus plugin, libmodbus-dev is not available on Squeeze.
+     - Disabled AMQP plugin, librabbitmq-dev is not available on Squeeze.
+   * debian/rules, debian/collectd-core.overrides:
+     - Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk (without arch).
+   * debian/collectd.conf:
+     - Removed sample config for the 'amqp' plugin.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Wed, 05 Dec 2012 14:59:05 +0100
+ 
+ collectd (5.2.0-2) experimental; urgency=low
+ 
+   * debian/patches:
+     - Added postgresql_writer_memleak.dpatch fixing a memory leak in the
+       PostgreSQL writer implementation.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Thu, 29 Nov 2012 09:09:51 +0100
+ 
 +collectd (5.2.0-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy.
 +  * Re-enabled the modbus and AMQP plugins which were previously disabled for
 +    Squeeze.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Wed, 28 Nov 2012 12:47:16 +0100
 +
  collectd (5.2.0-1~debmon60+1) debmon-squeeze; urgency=low
  
    * Rebuild for debmon-squeeze.