[pkg-java] r6782 - trunk/libcommons-collections3-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:53:54 +0000 (Wed, 30 Jul 2008)
New Revision: 6782

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


Modified: trunk/libcommons-collections3-java/debian/changelog
===================================================================
--- trunk/libcommons-collections3-java/debian/changelog	2008-07-30 15:50:05 UTC (rev 6781)
+++ trunk/libcommons-collections3-java/debian/changelog	2008-07-30 15:53:54 UTC (rev 6782)
@@ -1,3 +1,9 @@
+libcommons-collections3-java (3.2.1-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:51:16 +0000
+
 libcommons-collections3-java (3.2.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libcommons-collections3-java/debian/control
===================================================================
--- trunk/libcommons-collections3-java/debian/control	2008-07-30 15:50:05 UTC (rev 6781)
+++ trunk/libcommons-collections3-java/debian/control	2008-07-30 15:53:54 UTC (rev 6782)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 6), cdbs, quilt
-Build-Depends-Indep: ant, ant-optional, java-gcj-compat-dev, junit
+Build-Depends-Indep: ant, ant-optional, default-jdk, junit
 Standards-Version: 3.7.3
 Homepage: http://commons.apache.org/collections/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-collections3-java
@@ -14,7 +14,7 @@
 Package: libcommons-collections3-java
 Architecture: all
 Section: libs
-Depends: kaffe (>= 2:1.1.5-3) | java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Suggests: libcommons-collections3-java-doc
 Description: A set of abstract data type interfaces and implementations
  The Java Collections Framework provides a set of abstract data

Modified: trunk/libcommons-collections3-java/debian/rules
===================================================================
--- trunk/libcommons-collections3-java/debian/rules	2008-07-30 15:50:05 UTC (rev 6781)
+++ trunk/libcommons-collections3-java/debian/rules	2008-07-30 15:53:54 UTC (rev 6782)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
 DEB_ANT_BUILD_TARGET := jar tf.jar javadoc