Merged branch 'v5.4.1'.

diff --cc debian/changelog
index 866de1a904933babb63014f293fdefb9cf71e750,f42192a604953ded9b90737797cf77901eaede4e..a17f4a1f131e1b1fd1ce29ce7e8ce54f6c3d5ba6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,33 @@@
- collectd (5.4.1-2) UNRELEASED; urgency=medium
++collectd (5.4.1-3) 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-2) unstable; urgency=medium
+ 
+   * debian/rules, debian/control:
+     - Disable varnish for now; it does not work with varnish 4;
+       c.f. https://bugs.debian.org/745902 (Closes: #745894).
+     - Drop build dependency on libvarnishapi-dev.
+     - Build-depend on libow-dev and re-enable the onewire plugin; thanks to
+       Adam Smutnicki for pointing this out (Closes: #744956).
+   * debian/rules:
+     - Added INSTALL_BASE= to perl options; else, modules are installed
+       into $HOME.
+     - Prepend collectd/core to collectd's header files; thanks to Sergio
+       Jimenez for reporting this (Closes: #739516).
+   * debian/patches:
+     - Added collection.cgi.dpatch fixing apache data-sources; thanks to
+       Fabiano Pires for reporting this and providing a patch
+       (Closes: #743881).
+     - Added myplugin_api.dpatch updating myplugin.c to the latest API.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Sat, 26 Apr 2014 16:54:19 +0200
+ 
  collectd (5.4.1-1) unstable; urgency=medium
  
    * New upstream release:

diff --cc debian/control
index 9bbe283f0b1b0b8a221dffeac72575321650fe84,1300a7234d7d1fe4efa9ce19a354bace242efe48..e155c1c7afdc43f3bc17aea9037c5bbd18fc70a4
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -35,8 -36,8 +36,8 @@@ Build-Depends: debhelper (>= 5), dpkg-d
   libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
   libtokyocabinet-dev [linux-any],
   libtokyotyrant-dev [linux-any],
 - libupsclient1-dev,
 + libupsclient-dev | libupsclient1-dev,
-  libvarnish-dev,
+ # libvarnishapi-dev,
   libvirt-dev (>= 0.4.0-6) [linux-any],
   libxml2-dev,
   libyajl-dev,