Merge branch 'master' into sid

diff --git a/debian/changelog b/debian/changelog
index 530a5eff485b383aa227f23fbb067a2f16eda797..f6ee6ecc41ec80360922c5bcd0a4be8c331c1858 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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.

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9

diff --git a/debian/control b/debian/control
index f359073c7f6bd9baf499402ad7252e2f9dfd1780..206e36b6adc39076eb19400e8d06b2ba73e2ab70 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,20 @@ Section: utils
 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-systemd (>= 1.5), dh-strip-nondeterminism, dh-autoreconf,
+Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, 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],
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
+ libdevstat-dev [kfreebsd-any],
  libdbi0-dev,
  libesmtp-dev,
  libganglia1-dev (>= 3) [linux-any],
+ libgeom-dev [kfreebsd-any],
  libgcrypt20-dev,
  libglib2.0-dev,
  libgps-dev,
@@ -27,7 +30,6 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  libmodbus-dev,
  libmosquitto-dev,
  libmnl-dev [linux-any],
- libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
  liboping-dev (>= 0.3.3),
@@ -62,21 +64,22 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
 Build-Conflicts: libpthread-dev, libhal-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
+Vcs-Git: https://github.com/collectd/pkg-debian.git
+Vcs-Browser: https://github.com/collectd/pkg-debian.git
 
 Package: collectd-core
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
 Recommends: perl, rrdtool
 Suggests: collectd-dev,
 # collection.cgi / collection3 dependencies
  librrds-perl, liburi-perl, libhtml-parser-perl, libregexp-common-perl,
  libconfig-general-perl, httpd-cgi,
 # services providing data that may be collected by collectd
- apache2, apcupsd, bind9, ceph, chrony, gpsd, hddtemp, iptables, ipvsadm, lm-sensors, mbmon,
- memcached, mysql-server | virtual-mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
- pdns-server, postgresql, redis-server, slapd, time-daemon, varnish, zookeeper,
+ apache2, apcupsd, bind9, ceph, chrony, default-mysql-server, gpsd, hddtemp,
+ iptables, ipvsadm, lm-sensors, mbmon, memcached, nginx, notification-daemon,
+ nut, openvpn, olsrd, pdns-server, postgresql, redis-server, slapd,
+ time-daemon, varnish, zookeeper,
  ${shlibs:Suggests}, default-jre-headless
 Replaces: collectd (<< 4.8.2-1~)
 Description: statistics collection and monitoring daemon (core system)
@@ -286,7 +289,6 @@ Description: statistics collection and monitoring daemon (development files)
 Package: libcollectdclient-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: libcollectdclient1 (= ${binary:Version}), ${misc:Depends}
 Replaces: collectd-dev (<< 5.2.0-1)
 Breaks: collectd-dev (<< 5.2.0-1)

diff --git a/debian/copyright b/debian/copyright
index a2b3737ce6ae1f7f408481eb7fe6913c2918824b..8058dc7fcbac24e6a93b84ffda05ad379ae67cc6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -638,7 +638,7 @@ Licenses:
        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
-       Some files are licensed under version 2 only, while any others allow to
+       Some files are licensed under version 2 only, while any others allow one to
        use version 2 or (at your option) any later version.
 
 On Debian systems, the complete text of the GNU General Public License,
@@ -1012,7 +1012,7 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2006 Alexander Wirt <formorer@formorer.de>
 
        This program is free software; you can redistribute it and/or modify it
-       under the the terms of either:
+       under the terms of either:
 
        a) the Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)