r2134 - trunk/libjgrapht-java/debian

[Charles Fry]

Author: cfry-guest
Date: 2006-05-23 16:30:25 +0000 (Tue, 23 May 2006)
New Revision: 2134

Modified:
   trunk/libjgrapht-java/debian/control
   trunk/libjgrapht-java/debian/rules
Log:
use gcj instead of kaffe


Modified: trunk/libjgrapht-java/debian/control
===================================================================
--- trunk/libjgrapht-java/debian/control	2006-05-23 16:27:14 UTC (rev 2133)
+++ trunk/libjgrapht-java/debian/control	2006-05-23 16:30:25 UTC (rev 2134)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Charles Fry <debian at frogcircus.org>
 Uploaders: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), ant, kaffe
+Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), ant, java-gcj-compat-dev
 Standards-Version: 3.6.2
 
 Package: libjgrapht-java
 Architecture: all
-Depends: kaffe | java2-runtime
+Depends: java-gcj-compat | java2-runtime
 Suggests: java-virtual-machine
 Description: mathematical graph theory library for Java
  JGraphT is a free Java graph library that provides mathematical

Modified: trunk/libjgrapht-java/debian/rules
===================================================================
--- trunk/libjgrapht-java/debian/rules	2006-05-23 16:27:14 UTC (rev 2133)
+++ trunk/libjgrapht-java/debian/rules	2006-05-23 16:30:25 UTC (rev 2134)
@@ -3,12 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
-# fix bug #341275 in ant.mk
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
-
 DEB_ANT_BUILD_TARGET := compile
 DEB_ANT_INSTALL_TARGET := prepare.distribution
 DEB_ANT_TEST_TARGET := test