From 4538f78a8111e8c4739776e4096e3daba44aca69 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 23 Jan 2010 16:08:36 +0000 Subject: [PATCH] control, rules: Disabled plugins on kfreebsd whose build-deps are n/a (yet). --- debian/changelog | 10 ++++++++-- debian/control | 6 +++--- debian/rules | 8 ++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c45d4df..3e5d05f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,14 @@ collectd (4.9.1-1) unstable; urgency=low + "iptables" plugin / iptables-dev + "ipvs" plugin / linux-libc-dev + "netlink" plugin / iproute-dev - - -- Sebastian Harl Sat, 23 Jan 2010 15:56:31 +0000 + - Disabled the following plugins / removed the following build-deps on + kfreebsd-{i386,amd64} -- the build-deps are (not yet) available on + kfreebsd: + + "gmond" plugin / libganglia1-dev + + "libvirt" plugin / libvirt-dev + + "java" plugin / openjdk6-jdk + + -- Sebastian Harl Sat, 23 Jan 2010 16:06:38 +0000 collectd (4.8.2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2371706..a5e2f01 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libdbi0-dev, libesmtp-dev, - libganglia1-dev (>= 3), + libganglia1-dev (>= 3) [!kfreebsd-i386 !kfreebsd-amd64], libgcrypt11-dev, libglib2.0-dev, libhal-dev, @@ -27,11 +27,11 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, 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~), libupsclient1-dev, - libvirt-dev (>= 0.4.0-6), + libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64], libxml2-dev, libyajl-dev, linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64], - openjdk-6-jdk [!hppa], + openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64], python-dev Build-Conflicts: libpthread-dev Standards-Version: 3.8.3 diff --git a/debian/rules b/debian/rules index c4c545a..3cbe40c 100755 --- a/debian/rules +++ b/debian/rules @@ -99,6 +99,14 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64)) --disable-netlink endif +# Build-dependencies of these plugins are (not yet) available for kfreebsd. +ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64)) + confflags += \ + --disable-gmond \ + --disable-libvirt \ + --disable-java +endif + # The hppa buildds currently do not keep up with Java related stuff, thus # prevending testing transitions. ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa)) -- 2.30.2