[med-svn] [SCM] picard-tools branch, master, updated. debian/1.90-2-7-g8952456

[Olivier Sallou]

The following commit has been merged in the master branch:
commit 3ab0b461ed37c089980799d4e4405f61346676f2
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Tue Jul 9 09:28:52 2013 +0200

    add possibility to specify java options in command line

diff --git a/debian/bin/picard-tools b/debian/bin/picard-tools
index e892287..867a469 100755
--- a/debian/bin/picard-tools
+++ b/debian/bin/picard-tools
@@ -62,4 +62,4 @@ EOF
 esac
 
 p=/usr/share/java
-exec java -XX:MaxPermSize=256m -cp $p/jbzip2.jar:$p/picard.jar:$p/sam.jar:$p/cofoja.jar:$p/commons-jexl2.jar $main "$@"
+exec java $JAVA_OPTIONS -XX:MaxPermSize=256m -cp $p/jbzip2.jar:$p/picard.jar:$p/sam.jar:$p/cofoja.jar:$p/commons-jexl2.jar $main "$@"
diff --git a/debian/changelog b/debian/changelog
index 9e56d57..af09e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+picard-tools (1.90-3) unstable; urgency=low
+
+  * Add possibility to specify JAVA options (Closes: #705681),
+    with JAVA_OPTIONS env variable.
+
+ -- Olivier Sallou <osallou at debian.org>  Tue, 09 Jul 2013 09:20:07 +0200
+
 picard-tools (1.90-2) unstable; urgency=low
 
   * Load in unstable, all deps are available.

-- 
manipulate SAM and BAM files