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

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-04 13:26:22 +0000 (Wed, 04 Jan 2012)
New Revision: 9164

Added:
   trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
Log:
Next upload

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2012-01-04 10:24:00 UTC (rev 9163)
+++ trunk/packages/gdcm/trunk/debian/changelog	2012-01-04 13:26:22 UTC (rev 9164)
@@ -1,3 +1,10 @@
+gdcm (2.0.19-3) unstable; urgency=low
+
+  * Another attempt at fixing kFreeBSD:
+    - debian/patches/fixgcj2.patch
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 04 Jan 2012 14:25:57 +0100
+
 gdcm (2.0.19-2) unstable; urgency=low
 
   * Fix compilation on kFreeBSD when using gcj:

Added: trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch	2012-01-04 13:26:22 UTC (rev 9164)
@@ -0,0 +1,24 @@
+From 4ec434e5bfadaaea1d5af88cea784f7386ea4e6b Mon Sep 17 00:00:00 2001
+From: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Date: Wed, 4 Jan 2012 14:23:54 +0100
+Subject: [PATCH] Another round of fix for kFreeBSD OS
+
+---
+ CMake/FindJNI.cmake |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/CMake/FindJNI.cmake b/CMake/FindJNI.cmake
+index bb41bc7..62807a5 100644
+--- a/CMake/FindJNI.cmake
++++ b/CMake/FindJNI.cmake
+@@ -14,6 +14,7 @@ STRING(TOLOWER ${JavaProp_OS_NAME} include_os_name) # Linux -> linux
+ SET(JAVA_JNI_MD_INCLUDE_DIRECTORIES
+   ${JAVA_INCLUDE_PATH}/${include_os_name}
+   ${JAVA_INCLUDE_PATH}/win32 # win32
++  ${JAVA_INCLUDE_PATH}/linux # kFreeBSD
+   )
+ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
+   ${JAVA_JNI_MD_INCLUDE_DIRECTORIES}
+-- 
+1.7.4.1
+

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2012-01-04 10:24:00 UTC (rev 9163)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2012-01-04 13:26:22 UTC (rev 9164)
@@ -1,3 +1,4 @@
 toplevelskip.patch
 #removedocfromall.patch
 fixgcj.patch
+fixgcj2.patch