From: Marc Fournier Date: Tue, 1 Nov 2016 07:00:05 +0000 (+0100) Subject: Merge branch 'master' into sid X-Git-Tag: collectd-5.6.1-2^0 X-Git-Url: https://git.tokkee.org/?p=pkg-collectd.git;a=commitdiff_plain;h=ac8cb5e413fa0dd4848e63f2fbc69dbf9e138d7f;hp=bcabe68fa8833ffc00f884155f748b6408b083ca Merge branch 'master' into sid --- diff --git a/debian/changelog b/debian/changelog index 530a5ef..f6ee6ec 100644 --- 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 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 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index f359073..206e36b 100644 --- a/debian/control +++ b/debian/control @@ -3,17 +3,20 @@ Section: utils Priority: optional Maintainer: Sebastian Harl Uploaders: Marc Fournier -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 a2b3737..8058dc7 100644 --- 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 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)