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

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-01-17 16:02:43 +0000 (Sun, 17 Jan 2010)
New Revision: 4545

Added:
   trunk/packages/gdcm/trunk/debian/patches/libvtk-java_jni.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
Log:
Fix #564246. Thanks to Dominique for report+patch

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2010-01-17 14:21:04 UTC (rev 4544)
+++ trunk/packages/gdcm/trunk/debian/changelog	2010-01-17 16:02:43 UTC (rev 4545)
@@ -2,8 +2,9 @@
 
   * csc has been removed, renamed to mono-csc. Closes: #563020
   * Fix some lintian issues (${misc:Depends} and XS-Python-Version)
+  * Fix FTBS due to broken symlink in libvtk-java. Closes: #564246
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sun, 03 Jan 2010 15:48:53 +0100
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sun, 17 Jan 2010 16:56:19 +0100
 
 gdcm (2.0.14-2) unstable; urgency=low
 

Added: trunk/packages/gdcm/trunk/debian/patches/libvtk-java_jni.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/libvtk-java_jni.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/libvtk-java_jni.patch	2010-01-17 16:02:43 UTC (rev 4545)
@@ -0,0 +1,19 @@
+See bug #564246
+
+--- gdcm-2.0.14/Utilities/VTK/CMakeLists.txt	2010-01-17 16:52:19.000000000 +0100
++++ old/Utilities/VTK/CMakeLists.txt	2010-01-17 16:51:31.000000000 +0100
+@@ -255,13 +255,12 @@
+     if(EXISTS ${VTK_JAVA_JAR})
+       # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533193
+       set(GDCM_VTK_JAVA_JAR ${VTK_JAVA_JAR})
+-    else(EXISTS ${VTK_JAVA_JAR})
++    endif(EXISTS ${VTK_JAVA_JAR})
+       # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533198
+       if(EXISTS /usr/lib/jni/libvtkCommonJava.so)
+         message("Implicitely adding debian package layout...")
+         link_directories("/usr/lib/jni")
+       endif()
+-    endif(EXISTS ${VTK_JAVA_JAR})
+     MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR)
+     if(EXISTS ${GDCM_VTK_JAVA_JAR})
+     else(EXISTS ${GDCM_VTK_JAVA_JAR})

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2010-01-17 14:21:04 UTC (rev 4544)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2010-01-17 16:02:43 UTC (rev 4545)
@@ -1,2 +1,3 @@
 poppler_breaks_api.patch
 cmake28_namelink.patch
+libvtk-java_jni.patch