From 6b14b4783c4b02d93e6304e00c60e1ab5877130c Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 28 Nov 2012 08:35:08 +0100 Subject: [PATCH] changelog: Documented changes merged from squeeze-backports. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index e652984..8e93dd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,14 @@ collectd (5.2.0-1~debmon60+1) UNRELEASED; urgency=low - Reenabled 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 Wed, 28 Nov 2012 08:26:37 +0100 -- 2.30.2