[pkg-java] r6774 - trunk/commons-beanutils/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 14:58:30 +0000 (Wed, 30 Jul 2008)
New Revision: 6774

Modified:
   trunk/commons-beanutils/debian/changelog
   trunk/commons-beanutils/debian/control
   trunk/commons-beanutils/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/commons-beanutils/debian/changelog
===================================================================
--- trunk/commons-beanutils/debian/changelog	2008-07-30 13:56:17 UTC (rev 6773)
+++ trunk/commons-beanutils/debian/changelog	2008-07-30 14:58:30 UTC (rev 6774)
@@ -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 ]

Modified: trunk/commons-beanutils/debian/control
===================================================================
--- trunk/commons-beanutils/debian/control	2008-07-30 13:56:17 UTC (rev 6773)
+++ trunk/commons-beanutils/debian/control	2008-07-30 14:58:30 UTC (rev 6774)
@@ -3,7 +3,7 @@
 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 @@
 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

Modified: trunk/commons-beanutils/debian/rules
===================================================================
--- trunk/commons-beanutils/debian/rules	2008-07-30 13:56:17 UTC (rev 6773)
+++ trunk/commons-beanutils/debian/rules	2008-07-30 14:58:30 UTC (rev 6774)
@@ -5,7 +5,7 @@
 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