Merged branch 'v5.4.1'.

Conflicts:
	debian/changelog

diff --cc debian/changelog
index f875f39deb90ea203dcf83a34e88141076ea178d,9b832122f2b5aaea3c952ebe9b7f647ed029da2f..866de1a904933babb63014f293fdefb9cf71e750
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,29 @@@
- collectd (5.4.0-4) UNRELEASED; urgency=medium
++collectd (5.4.1-2) UNRELEASED; urgency=medium
 +
 +  * debian/control:
 +    - Added libupsclient-dev as primary alternate build-dep to
 +      libupsclient1-dev; thanks to Laurent Bigonville for reporting this and
 +      Marc Fournier for sending a patch (Closes: #730397).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 12 Jan 2014 17:41:45 +0100
 +
+ collectd (5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release:
+     - Fixed a segfault when using <Match> without an Instance; thanks to
+       Alexander Golovko for reporting this (Closes: #732701).
+     - Fixed gcrypt initialization issues (partly fixed in 5.1.1 already);
+       thanks to Pieter Lexis for reporting this (Closes: #735173).
+   * debian/patches:
+     - Removed amqp_0_4.dpatch; merged upstream.
+   * debian/control:
+     - Updated standards-version to 3.9.5; no changes.
+   * debian/rules:
+     - Use -Wno-error=deprecated-declarations to suppress libdbi deprecation
+       warnings for now; they would else cause build failures due to -Werror.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Tue, 28 Jan 2014 21:47:00 +0100
+ 
  collectd (5.4.0-3) unstable; urgency=low
  
    * debian/control:

diff --cc debian/control
Simple merge