control, rules: Disabled plugins on kfreebsd whose build-deps are n/a (yet).

diff --git a/debian/changelog b/debian/changelog
index c45d4df022fd02d3964895d283da468d7e579f9c..3e5d05fd06a527a29b000e587d5b09401a35e24c 100644 (file)
--- 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 <tokkee@debian.org>  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 <tokkee@debian.org>  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 23717060904d8ecc4326dc51d354ed6c13dbc304..a5e2f0184a1fd245700bb32b69f37caf1ef05c5b 100644 (file)
--- 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 c4c545ae7ef94dcd2eb20b44b7df9d2d1aae6204..3cbe40c695269789f502bd8e677e49218b68bf62 100755 (executable)
--- 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))