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

[Andreas Tille]

Author: tille
Date: 2009-06-26 13:19:58 +0000 (Fri, 26 Jun 2009)
New Revision: 3559

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/imagej.sh
   trunk/packages/imagej/trunk/debian/rules
Log:
Avoid error message if directory /usr/share/imagej/jni/ does not exist.


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2009-06-26 12:56:38 UTC (rev 3558)
+++ trunk/packages/imagej/trunk/debian/changelog	2009-06-26 13:19:58 UTC (rev 3559)
@@ -4,8 +4,8 @@
     - Depends ${java:Depends}
     - Depends java-gcj-compat instead of gij
     - Suggests: java-virtual-machine
-  * debian/rules: Added comment to possibly use
-    export JAVA_HOME=/usr/lib/jvm/default-java
+  * debian/imagej.sh: set jni=-Djava.library.path
+    only if directory /usr/share/imagej/jni/ really exists
 
  -- Andreas Tille <tille at debian.org>  Wed, 24 Jun 2009 15:35:51 +0200
 

Modified: trunk/packages/imagej/trunk/debian/imagej.sh
===================================================================
--- trunk/packages/imagej/trunk/debian/imagej.sh	2009-06-26 12:56:38 UTC (rev 3558)
+++ trunk/packages/imagej/trunk/debian/imagej.sh	2009-06-26 13:19:58 UTC (rev 3559)
@@ -406,7 +406,9 @@
 
 popd > /dev/null
 
-jni=-Djava.library.path=$(cat /usr/share/imagej/jni/* | tr '\n' ':')
+if [ -d /usr/share/imagej/jni/ ] ; then
+    jni=-Djava.library.path=$(cat /usr/share/imagej/jni/* | tr '\n' ':')
+fi
 
 if [ "$JAVA_HOME" ] ; then
 	if (( $verbosity > 0 )) ; then

Modified: trunk/packages/imagej/trunk/debian/rules
===================================================================
--- trunk/packages/imagej/trunk/debian/rules	2009-06-26 12:56:38 UTC (rev 3558)
+++ trunk/packages/imagej/trunk/debian/rules	2009-06-26 13:19:58 UTC (rev 3559)
@@ -9,11 +9,7 @@
 # include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # when open_jdk will be jpeg compliant i will use /usr/lib/jvm/java-6-openjdk/
-# Perhaps trying
-#     export JAVA_HOME=/usr/lib/jvm/default-java
-# is the best way to do -> just verify Java policy
  JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
-# JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | grep -vw sun | head -1 | cut -d' ' -f 3)
 # Use gcj as java home or search for other installed JVM
 #JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-gcj ] && echo "/usr/lib/jvm/java-gcj"), $(shell ls -L /usr/lib/jvm/ | grep -v -e "[0-9]$" -e "-gcj$" | head -1 ))