Merged branch 'master' into wheezy-backports-sloppy.

diff --git a/debian/changelog b/debian/changelog
index fc1d143bb58d1b01422e4e5c5e8a7fef51cdd6f1..07b01beee5a566c3de84b120fb414bcc4eb94f03 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,12 @@ collectd (5.5.1-2) unstable; urgency=medium
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 02 Apr 2016 11:02:49 +0200
 
+collectd (5.5.1-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
+
+  * Rebuild for wheezy-backports-sloppy.
+
+ -- Marc Fournier <marc@bl.uem.li>  Fri, 29 Jan 2016 14:18:24 +0100
+
 collectd (5.5.1-1) unstable; urgency=medium
 
   * New upstream release:
@@ -93,6 +99,20 @@ collectd (5.5.0-4) unstable; urgency=medium
 
  -- Marc Fournier <marc@bl.uem.li>  Mon, 16 Nov 2015 21:03:31 +0100
 
+collectd (5.5.0-3~bpo7+1) wheezy-backports-sloppy; urgency=medium
+
+  * Rebuild for wheezy-backports-sloppy.
+  * debian/rules, debian/control:
+    - remove references to systemd and strip-nondeterminism, which were
+      introduced in jessie.
+    - disable building sigrok, turbostat and write_kafka plugins, as the
+      required build-dependencies aren't available in wheezy.
+    - build uuid plugin against libhal, as this lib is still available on
+      wheezy.
+    - adjust libprotobuf build-dependency name.
+
+ -- Marc Fournier <marc@bl.uem.li>  Thu, 08 Oct 2015 08:26:10 +0200
+
 collectd (5.5.0-3) unstable; urgency=medium
 
   * debian/rules, debian/control:

diff --git a/debian/control b/debian/control
index 90e0bbd927deea35de78f6a72e63c2d6f9d8f94e..f89f5bbd4192a8d9e6527ecdfcd301d94c8d584b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,19 +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 (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  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,
  libdbi0-dev,
  libesmtp-dev,
  libganglia1-dev (>= 3) [linux-any],
  libgcrypt11-dev,
  libglib2.0-dev,
+ libhal-dev,
  libhiredis-dev,
  libi2c-dev,
  libkvm-dev [kfreebsd-any],
@@ -32,12 +33,12 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- libprotobuf-c-dev,
- librdkafka-dev,
+ libprotobuf-c0-dev,
+# librdkafka-dev,
  librabbitmq-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,7 +54,7 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
  python-dev
-Build-Conflicts: libpthread-dev, libhal-dev
+Build-Conflicts: libpthread-dev
 Standards-Version: 3.9.8
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git

diff --git a/debian/gbp.conf b/debian/gbp.conf
index dc23ff8dbfc8b6914a5e073f2c2da441e44a302c..0ec82d4e1bd178b76a1af8f3d583eb4c642c3638 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,5 @@
 # Configuration file for git-buildpackage and friends
 [DEFAULT]
 pristine-tar = True
+debian-branch = wheezy-backports-sloppy
 debian-tag = collectd-%(version)s

diff --git a/debian/rules b/debian/rules
index fca492c9b3d482e6613583f5a2e8bb38db04eb44..1029f44b9c9317435aabe2f260aca76b1fdbfd4a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -79,9 +79,18 @@ confflags += --disable-oracle
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros
 
+# libsigrok >= 0.2.0 is required for the sigrok plugin
+confflags += --disable-sigrok
+
+# linux-libc-dev >= 3.13 is required for the turbostat plugin.
+confflags += --disable-turbostat
+
 # libmongoc is required for the write_mongodb plugin.
 confflags += --disable-write_mongodb
 
+# librdkafka is required for the write_kafka plugin.
+confflags += --disable-write_kafka
+
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms
 
@@ -279,12 +288,9 @@ binary-arch: build install-arch
                && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \
                && rm -f lib/Collectd/Graph/MetaData.pm )
        dh_installdebconf -a
-       dh_systemd_enable -pcollectd-core --name=collectd
        dh_installinit -pcollectd-core --name=collectd -- defaults 95
-       dh_systemd_start -pcollectd-core
        dh_link -a
        dh_strip -a --dbg-package=collectd-dbg
-       dh_strip_nondeterminism -pcollectd-core
        dh_compress -a -Xexamples/
        dh_fixperms -a
        dh_makeshlibs -a