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

[Paul Cager]

Author: paulcager-guest
Date: 2007-03-03 23:40:09 +0000 (Sat, 03 Mar 2007)
New Revision: 3032

Modified:
   trunk/javacc/debian/README.Debian
   trunk/javacc/debian/manpage.sgml
   trunk/javacc/debian/rules
Log:
JavaCC - minor tidying up of rules

Modified: trunk/javacc/debian/README.Debian
===================================================================
--- trunk/javacc/debian/README.Debian	2007-03-03 20:15:34 UTC (rev 3031)
+++ trunk/javacc/debian/README.Debian	2007-03-03 23:40:09 UTC (rev 3032)
@@ -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.
 

Modified: trunk/javacc/debian/manpage.sgml
===================================================================
--- trunk/javacc/debian/manpage.sgml	2007-03-03 20:15:34 UTC (rev 3031)
+++ trunk/javacc/debian/manpage.sgml	2007-03-03 23:40:09 UTC (rev 3032)
@@ -79,8 +79,7 @@
     <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>

Modified: trunk/javacc/debian/rules
===================================================================
--- trunk/javacc/debian/rules	2007-03-03 20:15:34 UTC (rev 3031)
+++ trunk/javacc/debian/rules	2007-03-03 23:40:09 UTC (rev 3032)
@@ -14,11 +14,11 @@
 # 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 @@
 	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 @@
 	rm -f build-stamp configure-stamp
 	rm -f debian/javacc.1
 	${ANT} realclean
-
 	dh_clean
 
 install: build