[pkg-java] r3239 - trunk/trove/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2007-04-15 14:35:20 +0000 (Sun, 15 Apr 2007)
New Revision: 3239

Modified:
   trunk/trove/debian/changelog
   trunk/trove/debian/control
   trunk/trove/debian/rules
Log:
trying to build with non-free jdk but I can't

Modified: trunk/trove/debian/changelog
===================================================================
--- trunk/trove/debian/changelog	2007-04-15 10:14:51 UTC (rev 3238)
+++ trunk/trove/debian/changelog	2007-04-15 14:35:20 UTC (rev 3239)
@@ -1,5 +1,5 @@
-trove (2.0a2.dfsg.1-1) unstable; urgency=low
+trove (2.0~a2.dfsg.1-1) unstable; urgency=low
 
   * Initial Release (closes: #418678).
 
- -- Arnaud Vandyck <avdyk at debian.org>  Thu, 12 Apr 2007 17:44:02 +0200
+ -- Arnaud Vandyck <avdyk at debian.org>  Sun, 15 Apr 2007 16:31:58 +0200

Modified: trunk/trove/debian/control
===================================================================
--- trunk/trove/debian/control	2007-04-15 10:14:51 UTC (rev 3238)
+++ trunk/trove/debian/control	2007-04-15 14:35:20 UTC (rev 3239)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs
+Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, ibm-j2sdk1.5
 Standards-Version: 3.7.2
 
 Package: libtrove-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java2-runtime
+Depends: ibm-j2sdk1.5 | java2-runtime
 Description: high performance collections for java
  GNU Trove is a fast, lightweight  implementations of the java.util
  Collections API. These implementations are designed to be pluggable

Modified: trunk/trove/debian/rules
===================================================================
--- trunk/trove/debian/rules	2007-04-15 10:14:51 UTC (rev 3238)
+++ trunk/trove/debian/rules	2007-04-15 14:35:20 UTC (rev 3239)
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj/
+JAVA_HOME_DIRS := /usr/lib/j2sdk1.5-ibm /usr/lib/jvm/java-gcj/
 ANT_HOME := /usr/share/ant
 
 DEB_JARS :=