[med-svn] r15538 - trunk/packages/imagej/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-12-16 08:34:29 +0000 (Mon, 16 Dec 2013)
New Revision: 15538

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/control
   trunk/packages/imagej/trunk/debian/imagej.sh
Log:
Try to fix Bug#732222 (including new upstream version)


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2013-12-16 03:41:03 UTC (rev 15537)
+++ trunk/packages/imagej/trunk/debian/changelog	2013-12-16 08:34:29 UTC (rev 15538)
@@ -1,3 +1,12 @@
+imagej (1.48k+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * debian/imagej.sh: Make sure we are using latest JVM version
+    Closes: #732222
+  * Standards-Version: 3.9.5 (no changes needed)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 16 Dec 2013 09:12:23 +0100
+
 imagej (1.48e+dfsg-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/imagej/trunk/debian/control
===================================================================
--- trunk/packages/imagej/trunk/debian/control	2013-12-16 03:41:03 UTC (rev 15537)
+++ trunk/packages/imagej/trunk/debian/control	2013-12-16 08:34:29 UTC (rev 15538)
@@ -8,7 +8,7 @@
                debhelper (>= 9),
                ant,
                javahelper
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/imagej/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/imagej/trunk/
 Homepage: http://imagej.nih.gov/ij

Modified: trunk/packages/imagej/trunk/debian/imagej.sh
===================================================================
--- trunk/packages/imagej/trunk/debian/imagej.sh	2013-12-16 03:41:03 UTC (rev 15537)
+++ trunk/packages/imagej/trunk/debian/imagej.sh	2013-12-16 08:34:29 UTC (rev 15538)
@@ -29,7 +29,7 @@
 
 if [ -z "$JAVA_HOME" ] ; then
     # This does not work see #505315
-    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
+    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | sort | tail -1 | cut -d' ' -f 3)
     # Reverted to old version - see #558222 (Andreas Tille)
     # JAVA_HOME=$(dirname $(dirname $(dirname $(readlink /etc/alternatives/java))))
 fi