[pkg-java] r3023 - trunk/javacc/debian

[Paul Cager]

Author: paulcager-guest
Date: 2007-03-02 22:25:35 +0000 (Fri, 02 Mar 2007)
New Revision: 3023

Modified:
   trunk/javacc/debian/control
   trunk/javacc/debian/rules
Log:
JavaCC Depends: java-gcj-compat | java1-runtime | java2-runtime
JAVA_HOME=/usr/lib/jvm/java-gcj

Modified: trunk/javacc/debian/control
===================================================================
--- trunk/javacc/debian/control	2007-03-02 22:23:37 UTC (rev 3022)
+++ trunk/javacc/debian/control	2007-03-02 22:25:35 UTC (rev 3023)
@@ -9,7 +9,7 @@
 
 Package: javacc
 Architecture: all
-Depends: kaffe | gij | sablevm | java-virtual-machine
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Suggests: javacc-doc
 Description: A parser generator for use with Java
  Java Compiler Compiler (JavaCC) is (according to sun)

Modified: trunk/javacc/debian/rules
===================================================================
--- trunk/javacc/debian/rules	2007-03-02 22:23:37 UTC (rev 3022)
+++ trunk/javacc/debian/rules	2007-03-02 22:25:35 UTC (rev 3023)
@@ -7,7 +7,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
-export JAVACMD=/usr/bin/gij
+export JAVA_HOME=/usr/lib/jvm/java-gcj
 
 # Class path: Ant requires an JAXP-compatible XML parser
 # You need to set CLASSPATH here (even if your build.xml assembles its own
@@ -18,7 +18,7 @@
 
 # Ant options
 ANT_OPTS=-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter -Dant.home=${ANT_HOME} -Dant.build.javac.target=1.4
-ANT=${JAVACMD} org.apache.tools.ant.Main ${ANT_OPTS}
+ANT=${JAVA_HOME}/bin/java org.apache.tools.ant.Main ${ANT_OPTS}
 VERSION=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
 
 configure: configure-stamp