[med-svn] r18119 - trunk/packages/gdcm/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2014-09-24 12:26:17 +0000 (Wed, 24 Sep 2014)
New Revision: 18119

Modified:
   trunk/packages/gdcm/trunk/debian/libgdcm-java.install
   trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
   trunk/packages/gdcm/trunk/debian/rules
Log:
make sure to install JNI lib to correct spot

Modified: trunk/packages/gdcm/trunk/debian/libgdcm-java.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-java.install	2014-09-24 12:23:27 UTC (rev 18118)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-java.install	2014-09-24 12:26:17 UTC (rev 18119)
@@ -1,3 +1,2 @@
 usr/lib/*/gdcm.jar      usr/share/java
-# FIXME:
-usr/lib/*/libgdcmjni.so usr/lib/jni/
+usr/lib/*/jni/libgdcmjni.so

Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install	2014-09-24 12:23:27 UTC (rev 18118)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install	2014-09-24 12:26:17 UTC (rev 18119)
@@ -1,3 +1,2 @@
 usr/lib/*/vtkgdcm.jar       usr/share/java
-# FIXME
-usr/lib/*/libvtkgdcmJava.so usr/lib/jni
+usr/lib/*/jni/libvtkgdcmJava.so

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2014-09-24 12:23:27 UTC (rev 18118)
+++ trunk/packages/gdcm/trunk/debian/rules	2014-09-24 12:26:17 UTC (rev 18119)
@@ -76,6 +76,7 @@
 		-DGDCM_INSTALL_DOC_DIR:STRING=share/doc/gdcm-doc \
 		-DTAGFILES:STRING="/usr/share/doc/vtk-doc/html/vtk$(VTKVERS).tag=/usr/share/doc/vtk-doc/html/" \
 		-DGDCM_INSTALL_PYTHONMODULE_DIR:STRING=lib/python/dist-packages \
+		-DGDCM_INSTALL_JAVAMODULE_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)/jni \
 		-DGDCM_NO_PYTHON_LIBS_LINKING:BOOL=ON \
 		-DGDCM_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
 		-DGDCM_USE_VTK:BOOL=ON