[trove] 03/28: trying to build with non-free jdk but I can't

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository trove.

commit 5dd745809566d60cda44416228556083df6ff8b4
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Sun Apr 15 14:35:20 2007 +0000

    trying to build with non-free jdk but I can't
---
 debian/changelog | 4 ++--
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e641810..d3a0d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index aa88ea5..a237a51 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: libs
 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
diff --git a/debian/rules b/debian/rules
index 3396b48..8c08b95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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 := 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/trove.git