From: Sebastian Harl Date: Thu, 31 Jan 2013 07:38:40 +0000 (+0100) Subject: Merged branch 'experimental' into debmon-squeeze. X-Git-Tag: collectd-5.2.1-1--debmon70+1~1^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa9f45c632b3fa70f202525c195bcfb06fb0e871;p=pkg-collectd.git Merged branch 'experimental' into debmon-squeeze. Conflicts: debian/changelog --- aa9f45c632b3fa70f202525c195bcfb06fb0e871 diff --cc debian/changelog index 2bdbc9d,9fd190e..140b62e --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,15 +1,33 @@@ + collectd (5.2.1-1) experimental; urgency=low + + * New upstream release. + * debian/patches: + - Removed postgresql_writer_memleak.dpatch -- applied upstream. + * debian/collectd-utils.install: + - Install collectd-tg manpage. + * debian/control: + - Updated standards-version to 3.9.4 -- no changes. + + -- Sebastian Harl Wed, 30 Jan 2013 21:35:30 +0100 + +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 Wed, 05 Dec 2012 14:59:05 +0100 + collectd (5.2.0-2) experimental; urgency=low * debian/patches: