CVS libant1.6-java/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/libant1.6-java/debian
In directory haydn:/tmp/cvs-serv20758/debian

Modified Files:
	README.Debian changelog control rules 
Log Message:
new upstream to experimental

--- /cvsroot/pkg-java/libant1.6-java/debian/README.Debian	2005/05/06 12:40:21	1.5
+++ /cvsroot/pkg-java/libant1.6-java/debian/README.Debian	2005/05/25 21:45:51	1.6
@@ -9,11 +9,11 @@
   archives ant-nodeps.jar, ant-trax.jar and ant-junit.jar.
 
 - Other tasks that require packages from the Debian contrib archive can be
-  found in the ant package which is also in the contrib section the the Debian
+  found in the ant package which is also in the contrib section of the Debian
   archive.
 
 - You should only use /usr/share/ant1.6 for building Debian packages, use
-  /usr/share/ant in all other cases! The teasks in /usr/share/ant1.6 are
+  /usr/share/ant in all other cases! The tasks in /usr/share/ant1.6 are
   incomplete and may differ from upstream's version!
 
 - This package includes a gjdoc task. It can be use instead of the javadoc
@@ -24,6 +24,17 @@
 
   In order to user the gjdoc task you need to install the gjdoc package.
 
+  Differences between javadoc and gjdoc task:
+  -------------------------------------------
+  The javadoc task will always use the javadoc command which resides in the
+  java home directory of the executing virtual machine. This means that kaffe
+  for example will use gjdoc with the javadoc task, whereas the non-free JDKs
+  will use their own javadoc tool. This is the default behaviour as from upstream !
+
+  The gjdoc task instead, will always use gjdoc as the javadoc tool. So if you
+  want to use gjdoc with a non-free JDK for building the API you have to use the
+  gjdoc task.
+
 - If your package uses Ant 1.6 and you want it to be in the main section of the
   Debian archive you need to build depend on libant1.6-java and all other
   JARs from your class path. Then call Ant's main class directly in
--- /cvsroot/pkg-java/libant1.6-java/debian/changelog	2005/05/06 12:40:21	1.7
+++ /cvsroot/pkg-java/libant1.6-java/debian/changelog	2005/05/25 21:45:51	1.8
@@ -1,3 +1,16 @@
+libant1.6-java (1.6.4-1) experimental; urgency=low
+
+  * New upstream release
+  * Switched back to sablevm as it now can bootstrap ant again
+  * Reworked gjdoc task patch (closes: #307950)
+    + Based on current javadoc task
+    + Switched form reflection invocation to fork+exec invocation
+    + Works with kaffe, sablevm and ALSO with the non-free JDKs
+    + See README.Debian for further information
+  * Updated README.Debian and fixed typos
+
+ -- Wolfgang Baer <WBaer@gmx.de>  Thu, 19 May 2005 20:21:23 +0200
+
 libant1.6-java (1.6.3-1) experimental; urgency=low
 
   * New upstream release
--- /cvsroot/pkg-java/libant1.6-java/debian/control	2005/05/06 12:40:21	1.3
+++ /cvsroot/pkg-java/libant1.6-java/debian/control	2005/05/25 21:45:51	1.4
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe, libjaxp1.2-java, libxerces2-java, junit
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), sablevm (>= 1.1.5), jikes (>= 1.18), libjaxp1.2-java, libxerces2-java, junit
 Standards-Version: 3.6.1
 
 Package: libant1.6-java
--- /cvsroot/pkg-java/libant1.6-java/debian/rules	2005/05/06 12:40:22	1.5
+++ /cvsroot/pkg-java/libant1.6-java/debian/rules	2005/05/25 21:45:51	1.6
@@ -5,11 +5,11 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # Java home directory and the JVM executable
-export JAVA_HOME=/usr/lib/kaffe
+export JAVACMD=/usr/bin/java-sablevm
 
 # Java compiler for bootstrap.sh and the Ant javac task
 export JAVAC=/usr/bin/jikes
-export BOOTJAVAC_OPTS=-bootclasspath /usr/share/kaffe/Klasses.jar:/usr/share/java/jaxp-1.2.jar -target 1.3
+export BOOTJAVAC_OPTS=-bootclasspath /usr/lib/sablevm/jre/lib/rt.jar:/usr/share/java/jaxp-1.2.jar -target 1.3
 
 # The Xerces-J classes are added by a symlink in lib/
 export CLASSPATH=/usr/share/java/junit.jar