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

[Andreas Tille]

Author: tille
Date: 2014-03-12 13:13:52 +0000 (Wed, 12 Mar 2014)
New Revision: 16435

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/docs
   trunk/packages/imagej/trunk/debian/imagej.sh
Log:
Prevent using gcj from beeing considered as JVM for imagej


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2014-03-12 12:46:48 UTC (rev 16434)
+++ trunk/packages/imagej/trunk/debian/changelog	2014-03-12 13:13:52 UTC (rev 16435)
@@ -1,7 +1,9 @@
-imagej (1.48s+dfsg-1) UNRELEASED; urgency=medium
+imagej (1.48s+dfsg-1) unstable; urgency=medium
 
   * New upstream version
   * debian/imagej.sh: Only regard openjdk versions
+    Closes: #740439
+  * drop aREADME.txt from doc
 
  -- Andreas Tille <tille at debian.org>  Wed, 12 Mar 2014 13:51:41 +0100
 

Modified: trunk/packages/imagej/trunk/debian/docs
===================================================================
--- trunk/packages/imagej/trunk/debian/docs	2014-03-12 12:46:48 UTC (rev 16434)
+++ trunk/packages/imagej/trunk/debian/docs	2014-03-12 13:13:52 UTC (rev 16435)
@@ -1,3 +1,2 @@
-aREADME.txt
 IJ_Props.txt
 release-notes.html

Modified: trunk/packages/imagej/trunk/debian/imagej.sh
===================================================================
--- trunk/packages/imagej/trunk/debian/imagej.sh	2014-03-12 12:46:48 UTC (rev 16434)
+++ trunk/packages/imagej/trunk/debian/imagej.sh	2014-03-12 13:13:52 UTC (rev 16435)
@@ -32,6 +32,9 @@
     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))))
+    # Also suggested by From: JR Coding <jr.coding at googlemail.com>; To: 740439 at bugs.debian.org
+    # JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+    # however, this has the same problem if gcj might be set as default
 fi
 
 ##################### CREATE THE RIGHT ENVIRONMENT #####################