CVS ant/debian/patches

[Arnaud Vandyck]

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

Modified Files:
	02_ant_add_xerces.patch 
Log Message:
updated the patch with the current upstream script

--- /cvsroot/pkg-java/ant/debian/patches/02_ant_add_xerces.patch	2004/06/06 17:16:31	1.1
+++ /cvsroot/pkg-java/ant/debian/patches/02_ant_add_xerces.patch	2004/08/14 23:38:29	1.2
@@ -1,7 +1,7 @@
---- src/script/ant.orig	2004-06-06 18:34:10.000000000 +0200
-+++ src/script/ant	2004-06-06 18:36:18.000000000 +0200
-@@ -101,6 +101,13 @@
-   ANT_LIB="${JAVALIBDIR}/ant"
+--- src/script/ant.orig	2004-08-14 17:35:43.792546016 +0200
++++ src/script/ant	2004-08-14 17:37:47.661715040 +0200
+@@ -126,6 +126,13 @@
+   exit 1
  fi
  
 +# Add the Xerces 2 XML parser in the Debian version
@@ -11,6 +11,6 @@
 +  LOCALCLASSPATH="/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:$LOCALCLASSPATH"
 +fi
 +
- if [ -z "$LOCALCLASSPATH" ] ; then
-     LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
- else
+ # Build local classpath using just the launcher in non-rpm mode or
+ # use the Jpackage helper in rpm mode with basic and default jars
+ # specified in the ant.conf configuration. Because the launcher is