Merged branch 'experimental' into debmon-squeeze

[pkg-collectd.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e65298456fa9fad76c784b0028e91ea2934d913b..4ae15fca5befcfab82df432f29aa8ef539bfe926 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,28 @@
-collectd (5.2.0-1~debmon60+1) UNRELEASED; urgency=low
+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~debmon60+1) debmon-squeeze; urgency=low
 
   * Rebuild for debmon-squeeze.
   * debian/rules:
-    - Reenabled the netlink plugin (previously disabled for
+    - 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, 28 Nov 2012 08:26:37 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 28 Nov 2012 09:06:28 +0100
 
 collectd (5.2.0-1) experimental; urgency=low