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

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-05-05 13:49:10 +0000 (Wed, 05 May 2010)
New Revision: 4781

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
Log:
latest version

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2010-05-04 14:55:05 UTC (rev 4780)
+++ trunk/packages/gdcm/trunk/debian/changelog	2010-05-05 13:49:10 UTC (rev 4781)
@@ -1,3 +1,9 @@
+gdcm (2.0.14-8) unstable; urgency=low
+
+  * FTBFS on hppa. Fix the local findjni.cmake to search include dir properly
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 04 May 2010 16:24:41 +0200
+
 gdcm (2.0.14-7) unstable; urgency=low
 
   * FTBFS on hppa. Enhance the local findjni.cmake to search in hppa subdir

Modified: trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch	2010-05-04 14:55:05 UTC (rev 4780)
+++ trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch	2010-05-05 13:49:10 UTC (rev 4781)
@@ -2,7 +2,7 @@
 
 --- vtk-5.4.2.orig/CMake/FindJNI.cmake
 +++ vtk-5.4.2/CMake/FindJNI.cmake
-@@ -0,0 +1,187 @@
+@@ -0,0 +1,188 @@
 +# - 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
@@ -90,6 +90,7 @@
 +  /usr/lib/j2sdk1.4-sun/include
 +  /usr/lib/j2sdk1.5-sun/include
 +  /opt/sun-jdk-1.5.0.04/include
++  /usr/lib/jvm/default-java/include
 +  )
 +
 +FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")