CVS ant/debian/patches

[Arnaud Vandyck]

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

Modified Files:
	01_ant_home_path.patch 02_ant_add_xerces.patch 
Added Files:
	01_javadoc_maxmemory.patch 03_SplashTaskPatch_a.patch 
	03_SplashTaskPatch_b.patch 03_SplashTaskPatch_c.patch 
	04_UUMailerReflection.patch 
Log Message:
ant (1.6.5-1) unstable; urgency=low

  * New upstream release
    + Build with kaffe/gjdoc/jikes
    + Move to main (closes: #290228)
    + Refractored SplashTask to remove sun internal classes
      patches 03_SplashTaskPatch_a/b/c.patch (submitted upstream)
    + Patched UUMailer.java to use sun internal classes via reflection
    + Updated src/script/ant patches
    + Patched build.xml to include maxmemory option to build javadoc
  * Splashscreen now works with kaffe/gij-4.0/jamvm packages
    (closes: #169755, #164401)
  * Removed extraneous files left by failed builds (closes: #310266)
  * Added libjsch-java to path and include ant-jsch (closes: #305674)
  * Added ant-jmf to ant.install
  * Added java1-runtime | java2-runtime as alternatives to kaffe to Depends
  * Moved ant-doc to section doc (closes: #253448)
  * According to upstream changelog ant junitreport for JDK 1.5
    was fixed already in 1.6.2 (closes: #273560)
  * Taskdef attributes are the same as for Typedef and therefore
    described through the provided link to Typedef manual (closes: #254683)
  * Updated README.Debian
  * Updated build.xml.5 and ant.1 manpages
  * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
  * Moved java-virtual-machine to suggests
  * Used versioned dependency for libant1.6-java (same upstream version needed)
  * Call dh_installdocs directly to exclude redundant LICENSE files
  * Bumped Standards-Version to 3.6.2 - no changes
  * Added myself to uploaders
  * Upload sponsored by Arnaud Vandyck

 -- Wolfgang Baer <WBaer at gmx.de>  Thu, 23 Jun 2005 16:11:44 +0200


--- /cvsroot/pkg-java/ant/debian/patches/01_ant_home_path.patch	2004/06/06 17:16:31	1.1
+++ /cvsroot/pkg-java/ant/debian/patches/01_ant_home_path.patch	2005/08/07 22:19:17	1.2
@@ -1,19 +1,9 @@
---- src/script/ant.orig	2004-02-12 14:31:40.000000000 +0100
-+++ src/script/ant	2004-06-06 15:32:09.000000000 +0200
-@@ -47,33 +47,9 @@
+--- src/script/ant.orig	2005-05-19 14:40:48.000000000 +0200
++++ src/script/ant	2005-06-23 16:00:12.000000000 +0200
+@@ -87,25 +87,9 @@
+ esac
  
  if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
-   # try to find ANT
--  if [ -d /opt/ant ] ; then
--    ANT_HOME=/opt/ant
-+  if [ -d /usr/share/ant ] ; then
-+    ANT_HOME=/usr/share/ant
-   fi
--
--  if [ -d "${HOME}/opt/ant" ] ; then
--    ANT_HOME="${HOME}/opt/ant"
--  fi
--
 -  ## resolve links - $0 may be a link to ant's home
 -  PRG="$0"
 -  progname=`basename "$0"`
@@ -33,6 +23,9 @@
 -
 -  # make it fully qualified
 -  ANT_HOME=`cd "$ANT_HOME" && pwd`
++  if [ -d /usr/share/ant ] ; then
++     ANT_HOME=/usr/share/ant
++  fi
  fi
  
  # For Cygwin, ensure paths are in UNIX format before anything is touched
--- /cvsroot/pkg-java/ant/debian/patches/02_ant_add_xerces.patch	2004/08/14 23:38:29	1.2
+++ /cvsroot/pkg-java/ant/debian/patches/02_ant_add_xerces.patch	2005/08/07 22:19:17	1.3
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/script/ant.orig	2005-06-23 16:05:20.000000000 +0200
++++ src/script/ant	2005-06-23 16:04:20.000000000 +0200
+@@ -125,6 +125,13 @@
    exit 1
  fi