From: Sebastian Harl Date: Thu, 19 Nov 2009 09:56:20 +0000 (+0100) Subject: rules: Disabled the "java" plugin on hppa for now. X-Git-Tag: collectd-4.8.1-2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6fde828b55270a4388ebdea00ded4437ba2858ba;p=pkg-collectd.git 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 bb9fd17..2fd4c28 100644 --- 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 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 b7a28d0..3088c45 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -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 afddc8c..3296096 100755 --- 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