[med-svn] r4776 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-05-04 08:06:35 +0000 (Tue, 04 May 2010)
New Revision: 4776

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
Log:
trying to fix hppa

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2010-05-03 17:16:41 UTC (rev 4775)
+++ trunk/packages/gdcm/trunk/debian/changelog	2010-05-04 08:06:35 UTC (rev 4776)
@@ -1,3 +1,9 @@
+gdcm (2.0.14-7) unstable; urgency=low
+
+  * FTBFS on hppa. Enhance the local findjni.cmake to search in hppa subdir
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 04 May 2010 10:17:25 +0200
+
 gdcm (2.0.14-6) unstable; urgency=low
 
   * FTBFS on mipsel and armel, unable to find java. Closes: #579959

Modified: trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch	2010-05-03 17:16:41 UTC (rev 4775)
+++ trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch	2010-05-04 08:06:35 UTC (rev 4776)
@@ -2,7 +2,7 @@
 
 --- vtk-5.4.2.orig/CMake/FindJNI.cmake
 +++ vtk-5.4.2/CMake/FindJNI.cmake
-@@ -0,0 +1,184 @@
+@@ -0,0 +1,187 @@
 +# - Find JNI java libraries.
 +# This module finds if Java is installed and determines where the
 +# include files and libraries are. It also determines what the name of
@@ -59,6 +59,9 @@
 +  /usr/lib/jvm/default-java/jre/lib/sparc
 +  /usr/lib/jvm/default-java/jre/lib/x86_64
 +  /usr/lib/jvm/default-java/jre/lib/sh
++  /usr/lib/jvm/default-java/jre/lib/hppa
++  /usr/lib/jvm/default-java/jre/lib/
++  /usr/lib/jvm/default-java/lib/
 +  )
 +
 +SET(JAVA_JVM_LIBRARY_DIRECTORIES)