Merge branch 'master' into jessie-backports

diff --cc debian/changelog
index 7cf8ddb730c20f6a98f135e2c3248d6c65d70e80,094f89d3227899b3ea4928dc05589bef05987d83..4780c31817e426e9f5572f1e8aa754bfc821b7d5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,43 +1,55 @@@
+ collectd (5.7.0-3) unstable; urgency=medium
+ 
+   * debian/control: Skip libdpdk-dev build dependency on non-Intel
+     architectures.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Sun, 18 Dec 2016 22:08:27 +0100
+ 
+ collectd (5.7.0-2) unstable; urgency=medium
+ 
+   * debian/patches: add dpdkstat-portable-format-string.patch, fixing the
+     build on i386.
+   * debian/rules: Disable dpdkstat plugin on non-Intel architectures.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Sun, 18 Dec 2016 17:05:10 +0100
+ 
+ collectd (5.7.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     New plugins:
+     - DPDK interface statistics: dpdkstat
+     - Report the number of used and free hugepages: hugepages (Linux-specific)
+     - Intel Resource Director Technology statistics: intel_rdt (disabled in
+       Debian because of missing dependencies)
+     - Publish values in a Prometheus-compatible format: write_prometheus
+   * debian/rules:
+     - Disable hugepages plugin on non-Linux.
+     - Disable the intel_rdt plugin.
+   * debian/control:
+     - Build-depend on libdpdk-dev: Needed by the new dpdkstat plugin.
+     - Build-depend on libmicrohttpd-dev: Needed by the new write_prometheus
+       plugin.
+     - Suggests icinga instead of nagios packages (nagios3 removed from
+       Debian. Closes: #846859). Thanks to Bas Couwenberg.
+   * debian/patches:
+     - Removed configure_find_lc_all.patch; included upstream.
+     - Added nagios-debian-paths.patch, to use nagios-nrpe-server &
+       monitoring-plugin paths for Debian. Thanks to Bas Couwenberg.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Fri, 16 Dec 2016 22:11:21 +0100
+ 
 +collectd (5.6.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * debian/control:
 +    - Revert mysql-related package names back to libmysqlclient-dev and
 +      mysql-server.
 +    - Set lua plugin build-dependency to version available in jessie.
 +    - Set write_riemann plugin build-dependency to version available in
 +      jessie-backports.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Thu, 24 Nov 2016 14:22:34 +0100
 +
  collectd (5.6.1-2) unstable; urgency=medium
  
    * debian/control:

diff --cc debian/control
index cfb9b0c5ab6db787fa5c60b007a9e0340c01c68c,0ffd81adb21cf3f130ba3c244a8eef4ce250b2cc..d1437e5f4939c741f4f636639bd2821011428de0
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -23,9 -25,10 +24,10 @@@ Build-Depends: debhelper (>= 9.20120909
   libi2c-dev,
   libkvm-dev [kfreebsd-any],
   libldap2-dev,
 - liblua5.3-dev,
 + liblua5.2-dev,
   liblvm2-dev [linux-any],
   libmemcached-dev,
+  libmicrohttpd-dev,
   libmodbus-dev,
   libmosquitto-dev,
   libmnl-dev [linux-any],