[med-svn] r4726 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2010-04-11 22:53:38 +0000 (Sun, 11 Apr 2010)
New Revision: 4726

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Patch to load JNI libs from /usr/lib/jni.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-04-11 20:08:30 UTC (rev 4725)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-04-11 22:53:38 UTC (rev 4726)
@@ -3,6 +3,7 @@
   * Add Java bindings (thanks, Michal Suchanek).  Closes: #572132.
     Build-depend on default-jdk and javahelper (>= 0.18 to use CDBS
     class).
+  * patches/jni-dir.patch: New.  Load JNI from /usr/lib/jni.
   
   * Build with Tcl version 8.5.  Closes: #572131.
   * patches/itkTkImageViewer2D.patch: New.  Patch to build with tcl 8.5.
@@ -13,7 +14,7 @@
   * patches/use_system_vxl.patch: New.  Preparation for using system VXL;
     however, presently the CMake variable ITK_USE_SYSTEM_VXL is OFF.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 11 Apr 2010 10:16:03 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sun, 11 Apr 2010 17:52:07 -0500
 
 insighttoolkit (3.16.0-1) unstable; urgency=low
 

Added: trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch	2010-04-11 22:53:38 UTC (rev 4726)
@@ -0,0 +1,11 @@
+--- insighttoolkit-3.16.0.orig/Wrapping/CSwig/Java/CMakeLists.txt	2006-10-26 14:59:48.000000000 -0500
++++ insighttoolkit-3.16.0/Wrapping/CSwig/Java/CMakeLists.txt	2010-04-11 17:46:40.000000000 -0500
+@@ -5,7 +5,7 @@
+ IF(WIN32)
+   SET(ITK_JAVA_INSTALL_DIR "/../../bin")
+ ELSE(WIN32)
+-  SET(ITK_JAVA_INSTALL_DIR "")
++  SET(ITK_JAVA_INSTALL_DIR "/../../lib/jni")
+ ENDIF(WIN32)
+ 
+ IF(CMAKE_CONFIGURATION_TYPES)

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-04-11 20:08:30 UTC (rev 4725)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-04-11 22:53:38 UTC (rev 4726)
@@ -3,3 +3,4 @@
 tcl-install.patch
 use_system_vxl.patch
 itkTkImageViewer2D.patch
+jni-dir.patch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2010-04-11 20:08:30 UTC (rev 4725)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2010-04-11 22:53:38 UTC (rev 4726)
@@ -27,7 +27,8 @@
 pkg_tcl = tcl$(TCLVERS)-insighttoolkit$(VER_MAJOR)
 pkg_examples = insighttoolkit$(VER_MAJOR)-examples
 
-export JAVA_HOME=/usr/lib/jvm/default-java
+JAVA_HOME = /usr/lib/jvm/default-java
+JAVA_JNIDIR = /usr/lib/jni
 
 PYMODDIR = usr/lib/$(PYVERS)/site-packages
 PYEXTDIR = $(PYMODDIR)
@@ -87,7 +88,7 @@
 	jh_installlibs -p$(pkg_java) debian/tmp/usr/lib/InsightToolkit/*.jar
 
 install/$(pkg_jni)::
-	dh_install -p$(pkg_jni) debian/tmp/usr/lib/InsightToolkit/*Java.so* usr/lib/jni
+	dh_install -p$(pkg_jni) debian/tmp/usr/lib/InsightToolkit/*Java.so* $(JAVA_JNIDIR)
 
 install/$(pkg_python)::
 	dh_install -p$(pkg_python) -XlibSwig debian/tmp/usr/lib/InsightToolkit/*Python.so* $(PYEXTDIR)