[javacc4] 04/53: JavaCC Depends: java-gcj-compat | java1-runtime | java2-runtime JAVA_HOME=/usr/lib/jvm/java-gcj

[Emmanuel Bourg]

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

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

commit 283457c8d95e4c03738e4d6a0ab5e277100363db
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Fri Mar 2 22:25:35 2007 +0000

    JavaCC Depends: java-gcj-compat | java1-runtime | java2-runtime
    JAVA_HOME=/usr/lib/jvm/java-gcj
---
 debian/control | 2 +-
 debian/rules   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f2368df..34360d4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 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)
diff --git a/debian/rules b/debian/rules
index a3dce77..af3e0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:${ANT_HOME}/lib/an
 
 # 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

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