[javacc4] 05/53: JavaCC - minor tidying up of rules

[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 813eab293edd1235cc15749ba64db32288615043
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Sat Mar 3 23:40:09 2007 +0000

    JavaCC - minor tidying up of rules
---
 debian/README.Debian | 2 +-
 debian/manpage.sgml  | 3 +--
 debian/rules         | 9 +++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 1de2a2b..8de8805 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
 Debian README for JavaCC
 ------------------------
 
-JavaCC is now released under a pure, BSD license, including
+JavaCC is now released under a pure BSD license, including
 the bootstrap Jar. There is now no longer any need for a
 non-standard bootstrap Jar.
 
diff --git a/debian/manpage.sgml b/debian/manpage.sgml
index 16380e4..0818187 100644
--- a/debian/manpage.sgml
+++ b/debian/manpage.sgml
@@ -79,8 +79,7 @@ manpage.1: manpage.sgml
     <title>DESCRIPTION</title>
 
     <para>This manual page documents briefly the
-      <command>&dhpackage;</command>, <command>jjtree</command> and <command>jjdoc</command>
-      commands.</para>
+      <command>&dhpackage;</command>, <command>jjtree</command> and <command>jjdoc</command> commands.</para>
 
     <para>This manual page was written for the &debian; distribution
       because the original program does not have a manual page.</para>
diff --git a/debian/rules b/debian/rules
index af3e0c0..a1a58ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ export JAVA_HOME=/usr/lib/jvm/java-gcj
 # class path) to ensure the same build results in all cases
 JARS=/usr/share/java
 ANT_HOME=/usr/share/ant
-export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:${ANT_HOME}/lib/ant.jar:${ANT_HOME}/lib/ant-launcher.jar:$(JARS)/junit.jar:${JARS}/ecj.jar
+export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:$(JARS)/junit.jar
 
 # Ant options
-ANT_OPTS=-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter -Dant.home=${ANT_HOME} -Dant.build.javac.target=1.4
-ANT=${JAVA_HOME}/bin/java org.apache.tools.ant.Main ${ANT_OPTS}
+ANT_OPTS=-Dant.build.javac.target=1.4
+ANT=/usr/bin/ant ${ANT_OPTS}
 VERSION=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
 
 configure: configure-stamp
@@ -26,13 +26,11 @@ configure-stamp: patch-stamp
 	dh_testdir
 	touch configure-stamp
 
-
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 	${ANT}
 	docbook-to-man debian/manpage.sgml > debian/javacc.1
-
 	touch build-stamp
 
 clean: unpatch
@@ -41,7 +39,6 @@ clean: unpatch
 	rm -f build-stamp configure-stamp
 	rm -f debian/javacc.1
 	${ANT} realclean
-
 	dh_clean
 
 install: build

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