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

[Andreas Tille]

Author: tille
Date: 2013-12-16 15:48:32 +0000 (Mon, 16 Dec 2013)
New Revision: 15545

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/imagej.sh
Log:
At least commit what *should* have be uploaded previously.  Since it was not really a bug in the script it probably does not harm this way.  Otherwise we could upload (perhaps with new upstream again)


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2013-12-16 15:46:47 UTC (rev 15544)
+++ trunk/packages/imagej/trunk/debian/changelog	2013-12-16 15:48:32 UTC (rev 15545)
@@ -1,3 +1,9 @@
+imagej (1.48k+dfsg-2) UNRELEASED; urgency=medium
+
+  * debian/imagej.sh: Only regard openjdk versions
+
+ -- Andreas Tille <tille at debian.org>  Mon, 16 Dec 2013 16:52:03 +0100
+
 imagej (1.48k+dfsg-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/imagej/trunk/debian/imagej.sh
===================================================================
--- trunk/packages/imagej/trunk/debian/imagej.sh	2013-12-16 15:46:47 UTC (rev 15544)
+++ trunk/packages/imagej/trunk/debian/imagej.sh	2013-12-16 15:48:32 UTC (rev 15545)
@@ -29,7 +29,7 @@
 
 if [ -z "$JAVA_HOME" ] ; then
     # This does not work see #505315
-    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | sort | tail -1 | cut -d' ' -f 3)
+    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | grep openjdk | 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