[Debian-med-packaging] [SCM] picard-tools branch, master, updated. upstream/1.23-6-geb8591a

[Charles Plessy]

The following commit has been merged in the master branch:
commit eb8591a281d0567d248d67fa34560ce2d7e8e193
Author: Charles Plessy <plessy at debian.org>
Date:   Thu Jun 24 11:45:02 2010 +0900

    Change the path to javac in the second place where it appears as well.

diff --git a/debian/patches/debian-changes-1.22-1 b/debian/patches/debian-changes-1.22-1
index f7647e4..6eff093 100644
--- a/debian/patches/debian-changes-1.22-1
+++ b/debian/patches/debian-changes-1.22-1
@@ -23,8 +23,8 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- picard-tools-1.22.orig/build.xml
-+++ picard-tools-1.22/build.xml
+--- picard-tools.orig/build.xml
++++ picard-tools/build.xml
 @@ -23,7 +23,7 @@
    ~ THE SOFTWARE.
    -->
@@ -51,3 +51,12 @@ Last-Update: <YYYY-MM-DD>
                 compiler="javac1.5" fork="true">
              <!--<compilerarg value="-Xlint:all"/>-->
              <!--<compilerarg value="-Xlint:unchecked"/>-->
+@@ -121,7 +122,7 @@
+                optimize="${javac.opt}"
+                debug="${javac.debug}"
+                includes ="net/sf/samtools/**/*.*"
+-               executable="${JAVA_HOME_1_5}/bin/javac"
++               executable="javac"
+                compiler="javac1.5" fork="true"> <!-- Force SAM-JDK to be built with 1.5 -->
+             <!--<compilerarg value="-Xlint:unchecked"/>-->
+             <src path="${src.test}"/>

-- 
manipulate SAM and BAM files