Merge branch 'master' into wheezy-backports-sloppy

diff --cc debian/changelog
index eb0c3bdc2fd19fdb43f70042bde96bb7bc56c276,094f89d3227899b3ea4928dc05589bef05987d83..0ceef78bb5087dcedc7f88f72d1ca137cddb98ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,131 +1,137 @@@
+ 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) unstable; urgency=medium
+ 
+   * debian/control:
+     - Add libdevstat-dev and libgeom-dev to kfreebsd build-deps, as they're
+       needed by the disk plugin. Thanks to Florian Forster for pointing this
+       out.
+     - Update "Vcs-Git" and "Vcs-Browser" fields to point to GitHub repo.
+     - Changed build-dependency libmysqlclient-dev to
+       default-libmysqlclient-dev, and mysql-server to default-mysql-server.
+     - collectd-core.deb: Add "Depends" on lsb-base, as /etc/init.d/collectd
+       requires /lib/lsb/init-functions.
+     - Remove "Multi-Arch: same" from libcollectdclient-dev, until the package
+       gets reworked to really be multi-arch ready.
+   * debian/control, debian/compat:
+     - Bump debhelper compat version to 9.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Tue, 01 Nov 2016 07:32:47 +0100
+ 
+ collectd (5.6.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - write_graphite plugin is no longer linked against libyajl. Thanks to
+       Shish for reporting this (Closes: #839771).
+     - rrdcached plugin now reconnects to daemon. Thanks to Matthias Urlichs
+       for reporting this (Closes: #657877).
+   * debian/control:
+     - Add "Multi-Arch: same" to libcollectdclient-dev, as suggested by the
+       Multiarch hinter.
+   * debian/patches:
+     - Update configure_find_lc_all.patch to reliably pick the same JVM for
+       each build, making the process reproducible.
+   * debian/rules:
+     - Disable building the barometer, drbd, fhcount and ipc plugins on
+       kfreebsd architectures, as they are Linux-only.
+     - Run the test suite using dh_auto_test.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Sun, 09 Oct 2016 21:42:29 +0200
+ 
+ collectd (5.6.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - The disk plugin now supports FreeBSD; enable it in debian/rules.
+     - Suppress spammy debug messages; thanks to Antonio Russo for reporting
+       this (Closes: #797687).
+     New plugins:
+     - Chrony daemon statistics: chrony
+     - CPU sleep: Time spent in suspend: cpusleep (Linux-specific)
+     - Monitor gps related data through gpsd: gps
+     - Send or receive values over the network using the gRPC framework: grpc
+       (disabled in Debian because of missing dependencies)
+     - Lua interpreter embedded into collectd: lua
+     - Publishes and subscribes to MQTT topics: mqtt
+     - Submit notifications as passive check results to a local nagios
+       instance: notify_nagios
+     - XEN Hypervisor CPU stats: xencpu
+     - Solaris zone metrics: zone (disabled in Debian; Solaris specific)
+   * debian/rules:
+     - Disable cpusleep plugin on non-Linux.
+     - Disable xencpu plugin except on amd64, arm64, armhf, and i386.
+     - Disable the zone plugin.
+     - Do not cripple include files in collectd-dev when patching them; thanks
+       to Scott Talbert for reporting this (Closes: #827759).
+   * debian/control:
+     - Build-depend on libgps-dev: Needed by the new gps plugin.
+     - Build-depend on liblua5.3-dev: Needed by the new lua plugin.
+     - Build-depend on libmosquitto-dev: Needed by the new mqtt plugin.
+     - Build-depend on libxen-dev [amd64 arm64 armhf i386]: Needed by the new
+       xencpu plugin.
+     - Build-depend on libriemann-client-dev, riemann-c-client: Now needed by
+       the riemann plugin.
+   * debian/patches:
+     - Removed bts832577-gcry-control.patch; included upstream.
+     - Removed gcc6.patch; included upstream.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Sat, 24 Sep 2016 15:19:10 +0200
+ 
+ collectd (5.5.2-2) unstable; urgency=low
+ 
+   * debian/changelog:
+     - Set urgency back to low.
+   * debian/control:
+     - Update GCrypt's package name to libgcrypt20-dev.
+   * debian/patches:
+     - Added configure_find_lc_all.patch: forcing locale in configure script
+       will hopefully fix build reproducibility on non-amd64 plafroms.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Wed, 21 Sep 2016 14:01:55 +0200
+ 
 +collectd (5.5.2-1~bpo7+1) wheezy-backports-sloppy; urgency=high
 +
 +  * Rebuild for wheezy-backports-sloopy.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Sat, 06 Aug 2016 00:43:12 +0200
 +
  collectd (5.5.2-1) unstable; urgency=high
  
    * New upstream release.

diff --cc debian/control
index f89f5bbd4192a8d9e6527ecdfcd301d94c8d584b,0ffd81adb21cf3f130ba3c244a8eef4ce250b2cc..e8406b260050518db500da36aac1f7d4a083977d
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,20 -3,24 +3,25 @@@ Section: util
  Priority: optional
  Maintainer: Sebastian Harl <tokkee@debian.org>
  Uploaders: Marc Fournier <marc@bl.uem.li>
- Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf,
 -Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, dh-autoreconf,
++Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf, dh-autoreconf,
   bison, flex, autotools-dev, libltdl-dev, pkg-config,
+  default-libmysqlclient-dev,
   iptables-dev (>= 1.4.3.2-2) [linux-any],
   javahelper,
   kfreebsd-kernel-headers [kfreebsd-any],
   libatasmart-dev [linux-any],
 - libcap-dev [linux-any],
 +# libcap-dev [linux-any],
   libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
+  libdevstat-dev [kfreebsd-any],
   libdbi0-dev,
+  libdpdk-dev [amd64 i386],
   libesmtp-dev,
   libganglia1-dev (>= 3) [linux-any],
-  libgcrypt11-dev,
+  libgeom-dev [kfreebsd-any],
+  libgcrypt20-dev,
   libglib2.0-dev,
+  libgps-dev,
 + libhal-dev,
   libhiredis-dev,
   libi2c-dev,
   libkvm-dev [kfreebsd-any],
@@@ -33,12 -39,13 +40,14 @@@
   libpcap0.8-dev | libpcap-dev,
   libperl-dev,
   libpq-dev,
 - libprotobuf-c-dev,
 + libprotobuf-c0-dev,
 +# librdkafka-dev,
   librabbitmq-dev,
+  librdkafka-dev,
+  libriemann-client-dev,
   librrd-dev (>= 1.4~),
   libsensors4-dev [linux-any],
 - libsigrok-dev (>= 0.2~) [linux-any],
 +# libsigrok-dev (>= 0.2~),
  # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
   libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
   libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
@@@ -53,12 -61,13 +63,12 @@@
   linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
   default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
   protobuf-c-compiler,
 - python-dev,
 - riemann-c-client
 -Build-Conflicts: libpthread-dev, libhal-dev
 + python-dev
 +Build-Conflicts: libpthread-dev
  Standards-Version: 3.9.8
- Homepage: http://collectd.org/
- Vcs-Git: git://git.tokkee.org/pkg-collectd.git
- Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
+ Homepage: https://collectd.org/
+ Vcs-Git: https://github.com/collectd/pkg-debian.git
+ Vcs-Browser: https://github.com/collectd/pkg-debian.git
  
  Package: collectd-core
  Architecture: any

diff --cc debian/rules
Simple merge