[pkg-java] r6795 - trunk/libjcommon-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:54:13 +0000 (Wed, 30 Jul 2008)
New Revision: 6795

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


Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog	2008-07-30 17:50:23 UTC (rev 6794)
+++ trunk/libjcommon-java/debian/changelog	2008-07-30 17:54:13 UTC (rev 6795)
@@ -1,3 +1,9 @@
+libjcommon-java (1.0.10.dfsg-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:50:49 +0000
+
 libjcommon-java (1.0.10.dfsg-1) unstable; urgency=low
 
   * oops, we need to remove lib/junit.jar from the orig 

Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control	2008-07-30 17:50:23 UTC (rev 6794)
+++ trunk/libjcommon-java/debian/control	2008-07-30 17:54:13 UTC (rev 6795)
@@ -4,13 +4,13 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Rene Engelhard <rene at debian.org>
 Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, libservlet2.4-java, junit
+Build-Depends-Indep: default-jdk, ant, libservlet2.4-java, junit
 Standards-Version: 3.7.2
 
 Package: libjcommon-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java1-runtime | java2-runtime
 Suggests: java-virtual-machine, libjcommon-java-doc
 Description: General Purpose library for Java
  JCommon is a free general purpose Java class library that is used in

Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules	2008-07-30 17:50:23 UTC (rev 6794)
+++ trunk/libjcommon-java/debian/rules	2008-07-30 17:54:13 UTC (rev 6795)
@@ -8,7 +8,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 := \