[pkg-java] r6781 - trunk/libbsf-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:50:05 +0000 (Wed, 30 Jul 2008)
New Revision: 6781

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


Modified: trunk/libbsf-java/debian/changelog
===================================================================
--- trunk/libbsf-java/debian/changelog	2008-07-30 15:37:26 UTC (rev 6780)
+++ trunk/libbsf-java/debian/changelog	2008-07-30 15:50:05 UTC (rev 6781)
@@ -1,3 +1,9 @@
+libbsf-java (1:2.4.0-3) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:46:14 +0000
+
 libbsf-java (1:2.4.0-2) unstable; urgency=low
 
   * Added Build-Depends-Indep on libcommons-logging-java.

Modified: trunk/libbsf-java/debian/control
===================================================================
--- trunk/libbsf-java/debian/control	2008-07-30 15:37:26 UTC (rev 6780)
+++ trunk/libbsf-java/debian/control	2008-07-30 15:50:05 UTC (rev 6781)
@@ -4,13 +4,13 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: ant, ant-optional, java-gcj-compat-dev, libservlet2.4-java, libxalan2-java, jython, junit, libcommons-logging-java
+Build-Depends-Indep: ant, ant-optional, default-jdk, libservlet2.4-java, libxalan2-java, jython, junit, libcommons-logging-java
 Standards-Version: 3.7.3
 
 Package: libbsf-java
 Architecture: all
 Section: libs
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Suggests: libservlet2.4-java, libxalan2-java, jython, rhino, bsh
 Description: Bean Scripting Framework to support scripting languages in Java
  Bean Scripting Framework (BSF) is a set of Java classes which provides

Modified: trunk/libbsf-java/debian/rules
===================================================================
--- trunk/libbsf-java/debian/rules	2008-07-30 15:37:26 UTC (rev 6780)
+++ trunk/libbsf-java/debian/rules	2008-07-30 15:50:05 UTC (rev 6781)
@@ -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
 ANT_HOME  := /usr/share/ant
 
 DEB_JARS := xalan2 servlet-2.3 jython js ${ANT_HOME}/lib/ant-junit.jar junit commons-logging