[med-svn] [picard-tools] 01/02: use JAVA_HOME

[Olivier Sallou]

This is an automated email from the git hooks/post-receive script.

osallou pushed a commit to branch master
in repository picard-tools.

commit 22cc843acc87c8357c2f4193a56952be739ff7cf
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Tue Oct 22 09:06:48 2013 +0200

    use JAVA_HOME
---
 debian/patches/01-build.xml |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/patches/01-build.xml b/debian/patches/01-build.xml
index d8f7ab3..b663c6d 100644
--- a/debian/patches/01-build.xml
+++ b/debian/patches/01-build.xml
@@ -16,7 +16,16 @@ Forwarded: no
  
      <property name="src" value="src/java"/>
      <property name="src.scripts" value="src/scripts"/>
-@@ -70,6 +70,11 @@
+@@ -53,7 +53,7 @@
+     <property name="test.debug.port" value="5005" />  <!-- override on the command line if desired -->
+ 
+     <property environment="env"/>
+-    <property name="java6.home" value="${env.JAVA6_HOME}"/>
++    <property name="java6.home" value="${env.JAVA_HOME}"/>
+ 
+     <condition  property="isUnix">
+         <os family="unix"/>
+@@ -72,6 +72,11 @@
              <fileset dir="${lib}">
                  <include name="**/*.jar"/>
              </fileset>
@@ -28,7 +37,7 @@ Forwarded: no
          </path>
          <path  id="metrics.classpath">
              <pathelement path="${classpath}"/>
-@@ -194,8 +199,9 @@
+@@ -205,8 +210,9 @@
          <mkdir dir="${dist}"/>
          <jar destfile="${dist}/picard-${picard-version}.jar" compress="no">
              <fileset dir="${classes}" includes ="net/sf/picard/**/*.*"/>
@@ -39,7 +48,7 @@ Forwarded: no
              <manifest>
                  <attribute name="Implementation-Version" value="${picard-version}(${repository.revision})"/>
                  <attribute name="Implementation-Vendor" value="Broad Institute"/>
-@@ -225,6 +231,8 @@
+@@ -236,6 +242,8 @@
          </copy>
      </target>
  

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/picard-tools.git