disable plugins for which build-deps aren't met in precise

diff --git a/debian/changelog b/debian/changelog
index afd077dd9d3cb1187e759c3befe7642ba211cc90..48cb448c63371cecbd35c5fd960095cb324af66f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ collectd (5.5.0-3ubuntu0~ppa12.04.1) precise; urgency=medium
   * debian/rules, debian/control:
     - remove references to systemd and strip-nondeterminism, which aren't
       available in precise.
+    - disable building lvm, sigrok, turbostat and write_kafka plugins, as the
+      required build-dependencies aren't available in precise.
+    - build uuid plugin against libhal, as this lib is still available on
+      precise.
+    - adjust libprotobuf and libvarnish build-dependency name.
 
  -- Marc Fournier <marc@bl.uem.li>  Fri, 09 Oct 2015 23:35:23 +0200
 

diff --git a/debian/control b/debian/control
index 6e36bdfd007ffea65b72dc095b0cc48e6e508b7d..bd5d0b74c3f967cf30d1f230b5d9fe8368d8b09a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,11 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf,
  libganglia1-dev (>= 3) [linux-any],
  libgcrypt11-dev,
  libglib2.0-dev,
+ libhal-dev,
  libhiredis-dev,
  libi2c-dev,
  libkvm-dev [kfreebsd-any],
  libldap2-dev,
- liblvm2-dev [linux-any],
  libmemcached-dev,
  libmodbus-dev,
  libmnl-dev [linux-any],
@@ -32,12 +32,10 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
- libprotobuf-c-dev,
- librdkafka-dev,
+ libprotobuf-c0-dev,
  librabbitmq-dev,
  librrd-dev (>= 1.4~),
  libsensors4-dev [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~),
@@ -45,7 +43,7 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf,
  libtokyotyrant-dev [linux-any],
  libudev-dev [linux-any],
  libupsclient-dev | libupsclient1-dev,
- libvarnishapi-dev,
+ libvarnish-dev,
  libvirt-dev (>= 0.4.0-6) [linux-any],
  libxml2-dev,
  libyajl-dev,
@@ -53,7 +51,7 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf,
  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.6
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git

diff --git a/debian/rules b/debian/rules
index e22b2a86311bdd23845ba9495975c0022aa26748..e25fc6ce5fb3b6d843bb49b4fc66c62c2fa8b066 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,9 @@ confflags += --disable-tape
 # libaquaero5 is required for the aquaero plugin
 confflags += --disable-aquaero
 
+# liblvm2 >= 2.02.75 is required for the lvm plugin
+confflags += --disable-lvm
+
 # libmic is required for the mic plugin
 confflags += --disable-mic
 
@@ -85,9 +88,18 @@ confflags += --disable-oracle
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros
 
+# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
+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