[commons-beanutils] 26/56: * (Build-)depend on default-jre/-jdk.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository commons-beanutils.

commit 5b3155844f782474965635d601b7712282bc1f7e
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 14:58:30 2008 +0000

    * (Build-)depend on default-jre/-jdk.
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1d764e..fb40f2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+commons-beanutils (1.8.0~beta-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 14:55:15 +0000
+
 commons-beanutils (1.8.0~beta-1) unstable; urgency=low
 
   [ Kumar Appaiah ]
diff --git a/debian/control b/debian/control
index 6586dbd..7dfb128 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs, ant, ant-optional, libcommons-collections3-java, libcommons-logging-java, junit, java-gcj-compat-dev
+Build-Depends: debhelper (>= 4.2.30), cdbs, ant, ant-optional, libcommons-collections3-java, libcommons-logging-java, junit, default-jdk
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-beanutils
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-beanutils
@@ -12,7 +12,7 @@ Homepage: http://commons.apache.org/beanutils/
 Package: libcommons-beanutils-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-collections3-java, libcommons-logging-java
+Depends: default-jre-headless | java2-runtime-headless, libcommons-collections3-java, libcommons-logging-java
 Suggests: libcommons-beanutils-java-doc
 Description: utility for manipulating JavaBeans
  The BeanUtils Component contains a set of Java classes that provide
diff --git a/debian/rules b/debian/rules
index cedfb6f..8fd1932 100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_JARS := commons-logging commons-collections3 junit
 DEB_ANT_BUILD_TARGET := dist

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-beanutils.git