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

[Andreas Tille]

Author: tille
Date: 2009-12-01 18:48:46 +0000 (Tue, 01 Dec 2009)
New Revision: 4423

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/control
   trunk/packages/imagej/trunk/debian/imagej.sh
Log:
New upstream version, depend explicitely from openjdk because otherwise the application crashes


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2009-12-01 18:42:27 UTC (rev 4422)
+++ trunk/packages/imagej/trunk/debian/changelog	2009-12-01 18:48:46 UTC (rev 4423)
@@ -1,3 +1,17 @@
+imagej (1.43l-1) unstable; urgency=low
+
+  * New upstream version
+  * Depend from OpenJdk instead of java-gcj-compat because the application
+    crashes if OpenJdk is not installed
+    Closes: #558222
+    Considering the fact that the workaround of #532498 seems to be solved
+    as well in case openjdk-6-jre which contains the file
+    /usr/lib/jvm/java-6-openjdk/jre/lib/ext/libjava-access-bridge-jni.so
+    I think this also
+    Closes: #532498
+
+ -- Andreas Tille <tille at debian.org>  Tue, 01 Dec 2009 19:24:37 +0100
+
 imagej (1.43k-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/imagej/trunk/debian/control
===================================================================
--- trunk/packages/imagej/trunk/debian/control	2009-12-01 18:42:27 UTC (rev 4422)
+++ trunk/packages/imagej/trunk/debian/control	2009-12-01 18:48:46 UTC (rev 4423)
@@ -13,7 +13,7 @@
 
 Package: imagej
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime,
+Depends: ${java:Depends}, ${misc:Depends}, openjdk-6-jre | java2-runtime
 Suggests: java-virtual-machine
 Description: Image processing program inspired by NIH Image for the Macintosh
  It can display, edit, analyze, process, save and print 8-bit, 16-bit and

Modified: trunk/packages/imagej/trunk/debian/imagej.sh
===================================================================
--- trunk/packages/imagej/trunk/debian/imagej.sh	2009-12-01 18:42:27 UTC (rev 4422)
+++ trunk/packages/imagej/trunk/debian/imagej.sh	2009-12-01 18:48:46 UTC (rev 4423)
@@ -2,9 +2,11 @@
 
 # imagej.sh - a not so simple wrapper script used to run ImageJ
 
-#	Copyright © 2008 Paolo Ariano
+#	Copyright © 2008 Paolo Ariano,
+#                 © 2009 Andreas Tille
 #	Authors: Paolo Ariano (paolo dot ariano at unito dot it)
-#	Last modified date: 04 March 2008
+#                Andreas Tille <tille at debian.org>
+#	Last modified date: 01 December 2009
 
 # This is a not so simple wrapper script used to run ImageJ in Unix but 
 # optimized for Debian GNU/Linux, this is a merge between my original script 
@@ -27,8 +29,9 @@
 
 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=$(dirname $(dirname $(dirname $(readlink /etc/alternatives/java))))
+    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
+    # Reverted to old version - see #558222 (Andreas Tille)
+    # JAVA_HOME=$(dirname $(dirname $(dirname $(readlink /etc/alternatives/java))))
 fi
 
 ##################### CREATE THE RIGHT ENVIRONMENT #####################