CVS ant/debian

[Wolfgang B??r]

Update of /cvsroot/pkg-java/ant/debian
In directory haydn:/tmp/cvs-serv13178/debian

Modified Files:
	changelog control rules 
Log Message:
ant (1.6.5-3) unstable; urgency=low

  * Fixed FTBS by adding bootstrap ANT_HOME (closes: #331081)
  * Add javacc to Suggests as needed by javacc task (closes: #330513)


--- /cvsroot/pkg-java/ant/debian/changelog	2005/09/21 18:39:34	1.14
+++ /cvsroot/pkg-java/ant/debian/changelog	2005/10/01 18:44:00	1.15
@@ -1,3 +1,10 @@
+ant (1.6.5-3) unstable; urgency=low
+
+  * Fixed FTBS by adding bootstrap ANT_HOME (closes: #331081)
+  * Add javacc to Suggests as needed by javacc task (closes: #330513)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat,  1 Oct 2005 17:15:35 +0200
+
 ant (1.6.5-2) unstable; urgency=low
 
   * Converted package to no longer depend on libant1.6-java 
@@ -29,7 +36,7 @@
     Added ant-doc.doc-base.1 and ant-doc.doc-base.2
   * Added the gjdoc task from libant1.6-java (closes: #324884)
 
-  * Upload sponsored by XXX
+  * Upload sponsored by Arnaud Vandyck <avdyk at debian.org>
 
  -- Wolfgang Baer <WBaer at gmx.de>  Mon, 15 Aug 2005 15:17:36 +0200
 
--- /cvsroot/pkg-java/ant/debian/control	2005/09/21 18:39:34	1.14
+++ /cvsroot/pkg-java/ant/debian/control	2005/10/01 18:44:01	1.15
@@ -12,7 +12,7 @@
 Priority: optional
 Depends: kaffe | java-virtual-machine, kaffe | java1-runtime | java2-runtime, libxerces2-java
 Recommends: ant-optional, jikes | java-compiler
-Suggests: ant-doc, libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Suggests: ant-doc 
 Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
 Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
 Description: Java based build tool like make
@@ -27,7 +27,7 @@
 Section: devel
 Priority: optional
 Depends: kaffe | java1-runtime | java2-runtime, ant (= ${Source-Version})
-Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
 Conflicts: libant1.6-java
 Replaces: libant1.6-java
 Description: Java based build tool like make - optional libraries
--- /cvsroot/pkg-java/ant/debian/rules	2005/09/21 18:39:34	1.12
+++ /cvsroot/pkg-java/ant/debian/rules	2005/10/01 18:44:01	1.13
@@ -12,6 +12,8 @@
 export JAVAC=/usr/bin/jikes
 # needed for bootstrap
 export BOOTJAVAC_OPTS=-bootclasspath /usr/share/kaffe/Klasses.jar -source 1.3 -target 1.3 -nowarn
+# needed for building with bootstrap ant
+export ANT_HOME := bootstrap
 
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -21,7 +23,7 @@
 endif
 
 JAR_PATH := /usr/share/java
-CLASSPATH := ${CLASSPATH}:${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/gnumail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-commons-resolver-1.1.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar
+CLASSPATH := ${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/gnumail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-commons-resolver-1.1.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar
 
 build:
 	# doing bootstrapping