rules: Disabled the "java" plugin on hppa for now.

This is required to work around a backlog in the buildds that currently
prevents a transition to testing.

control: Do not build-depend on openjdk-6-jdk on hppa.

diff --git a/debian/changelog b/debian/changelog
index bb9fd175bec3692a612e2790f679728b1b3fb5c5..2fd4c28a44f1880035fcc0a377d22fba7d596c6c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+collectd (4.8.1-2) unstable; urgency=low
+
+  * debian/rules:
+    - Disabled the "java" plugin on hppa for now to work around a backlog in
+      the buildds that currently prevents a transition to testing.
+  * debian/control:
+    - Do not build-depend on openjdk-6-jdk on hppa.
+
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 19 Nov 2009 10:55:33 +0100
+
 collectd (4.8.1-1) unstable; urgency=medium
 
   * New upstream release:

diff --git a/debian/control b/debian/control
index b7a28d03cd90c5389e30463d33d6106fc9595ff5..3088c456c961c32cc4f953e6b2ca71618c57c1ca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6), libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk, libganglia1-dev (>= 3), libgcrypt11-dev, libyajl-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6), libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk [!hppa], libganglia1-dev (>= 3), libgcrypt11-dev, libyajl-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.8.3
 Homepage: http://collectd.org/

diff --git a/debian/rules b/debian/rules
index afddc8c2d8462e1f0b29d98880c2039802ff6a90..329609682d32796d2a83f04c7113f3efd764c18a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,12 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))
        confflags += --disable-netlink
 endif
 
+# The hppa buildds currently do not keep up with Java related stuff, thus
+# prevending testing transitions.
+ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa))
+       confflags += --disable-java
+endif
+
 config.status: configure $(DPATCH_STAMPFN)
        dh_testdir