Bug#301267: libant1.6-java: Working patch

[Etienne Gagnon]

--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Package: libant1.6-java
Version: 1.6.2-2
Followup-For: Bug #301267

Here is a full patch to solve the problem.

Have fun!

Etienne

-- 
Etienne M. Gagnon, Ph.D.             http://www.info.uqam.ca/~egagnon/
SableVM:                                       http://www.sablevm.org/
SableCC:                                       http://www.sablecc.org/

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: powerpc (ppc)
Kernel: Linux 2.4.24-ben1
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages libant1.6-java depends on:
ii  classpath-common              2:0.14-1   architecture independent files
ii  jamvm [java1-runtime]         1.2.5-1    virtual machine which conforms to 
ii  java2-runtime-equivs [java2-r 1.0        Dummy package to fulfil package de
ii  sablevm [java1-runtime]       1.11.1-2   Free implementation of Java Virtua

-- no debconf information

--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch.txt"

Only in libant1.6-java-1.6.2: bin
Only in libant1.6-java-1.6.2-modified/: bootstrap
Only in libant1.6-java-1.6.2-modified/build: LICENSE.dom.txt
Only in libant1.6-java-1.6.2-modified/build: LICENSE.sax.txt
Only in libant1.6-java-1.6.2-modified/build: LICENSE.txt
Only in libant1.6-java-1.6.2-modified/build: LICENSE.xerces.txt
Only in libant1.6-java-1.6.2-modified/build: NOTICE.txt
Only in libant1.6-java-1.6.2/build: classes
Only in libant1.6-java-1.6.2-modified/build: lib
Only in libant1.6-java-1.6.2-modified/build: optional.manifest
diff -r -u libant1.6-java-1.6.2/build.xml libant1.6-java-1.6.2-modified/build.xml
--- libant1.6-java-1.6.2/build.xml	2005-03-25 12:31:30.000000000 -0500
+++ libant1.6-java-1.6.2-modified/build.xml	2005-03-25 12:23:20.000000000 -0500
@@ -48,8 +48,8 @@
   <property name="chmod.maxparallel" value="250"/>
   <property name="deprecation" value="false"/>
   <property name="optimize" value="true"/>
-  <property name="javac.target" value="1.2"/>
-  <property name="javac.source" value="1.2"/>
+  <property name="javac.target" value="1.3"/>
+  <property name="javac.source" value="1.3"/>
   <property name="junit.fork" value="false"/>
   <property name="junit.filtertrace" value="off"/>
   <property name="junit.summary" value="no"/>
Only in libant1.6-java-1.6.2-modified/debian: files
Only in libant1.6-java-1.6.2-modified/debian: libant1.6-java
diff -r -u libant1.6-java-1.6.2/debian/rules libant1.6-java-1.6.2-modified/debian/rules
--- libant1.6-java-1.6.2/debian/rules	2005-03-25 12:31:27.000000000 -0500
+++ libant1.6-java-1.6.2-modified/debian/rules	2005-03-25 12:18:08.000000000 -0500
@@ -9,7 +9,7 @@
 
 # Java compiler for bootstrap.sh and the Ant javac task
 export JAVAC=/usr/bin/jikes
-export BOOTJAVAC_OPTS=-bootclasspath /usr/share/sablevm/sablevm-classpath:/usr/share/java/jaxp-1.2.jar -target 1.2
+export BOOTJAVAC_OPTS=-bootclasspath /usr/lib/sablevm/jre/lib/rt.jar:/usr/share/java/jaxp-1.2.jar -target 1.2
 
 # The Xerces-J classes are added by a symlink in lib/
 export CLASSPATH=/usr/share/java/junit.jar

--1yeeQ81UyVL57Vl7--