diff --git a/debian/changelog b/debian/changelog
index fc6b338e54393c6e5c74faeacd821e313f5df1db..f3b199690985dc684cbb3df8b7fdfee9850619c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
(Closes: #625323).
- Added support for libnotify 0.7; thanks to Michael Biebl for reporting
this (Closes: #636818).
- * debian/control, debian/rules:
- - Depend on libmodbus-dev (which is now available in Debian) and enabled
- "modbus" plugin; thanks to Ivo De Decker for reporting this
- (Closes: #639796).
+ - Fixed FTBFS with current libiptc; thanks to Lucas Nussbaum for reporting
+ this (Closes: #614439).
+ * debian/patches:
+ - Removed bts595756-notify_email-segfault -- included upstream.
+ - Removed bts592623-curl_json-file -- included upstream.
+ - Removed bts596128-reheap-fix -- included upstream.
+ - Removed CVE-2010-4336 -- included upstream.
+ * debian/rules:
+ - Append DEB_BUILD_ARCH to JAVA_HOME; this is how it's done in the OpenJDK
+ package.
+ - Split 'build' target into 'build-arch' and 'build-indep' as recommended
+ by policy.
+ * debian/patches/ipvs_h_include, debian/rules:
+ - Let the ipvs plugin use linux/ip_vs.h rather than net/ip_vs.h. Also,
+ make sure to look for the header in /usr/include rather than the kernel
+ directory (which has been deprecated).
+ - Force building of the ipvs plugin since configure is not currently able
+ to correctly check for ip_vs.h.
+ * debian/control:
+ - Updated standards-version to 3.9.2 -- no changes.
+ * debian/collectd-core.collectd.init.d:
+ - Added a description LSB header field.
+ * debian/collectd-core.overrides:
+ - Updated entry for java's binary-or-shlib-defines-rpath.
- -- Sebastian Harl <tokkee@debian.org> Thu, 05 Jan 2012 15:15:21 +0100
+ -- Sebastian Harl <tokkee@debian.org> Mon, 09 Jan 2012 16:10:58 +0100
collectd (4.10.1-2.1) unstable; urgency=high