[med-svn] r4255 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Oct 27 14:36:54 UTC 2009
Author: malat-guest
Date: 2009-10-27 14:36:54 +0000 (Tue, 27 Oct 2009)
New Revision: 4255
Added:
trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch
Removed:
trunk/packages/gdcm/trunk/debian/patches/gcc44.patch
trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch
trunk/packages/gdcm/trunk/debian/patches/java_covariant_return_type.patch
trunk/packages/gdcm/trunk/debian/patches/share_man.patch
trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
trunk/packages/gdcm/trunk/debian/patches/series
Log:
prepare for gdcm 2.0.13. Missing bug number in changelog, will fix when debian servers are up again
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/changelog 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,3 +1,11 @@
+gdcm (2.0.12-12) unstable; urgency=low
+
+ * New release: GDCM 2.0.13. Closes:
+ * Fix debian layout to deal with new CharLS (JPEG-LS) library.
+ * Fix issue with java covariant return type. Closes: #542253
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 27 Oct 2009 09:57:23 +0100
+
gdcm (2.0.12-11) unstable; urgency=low
* XML files are part of the runtime lib (used by gdcminfo as ressources).
Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2009-10-27 14:36:54 UTC (rev 4255)
@@ -6,10 +6,12 @@
usr/lib/libgdcmjpeg12.so
usr/lib/libgdcmjpeg16.so
usr/lib/libgdcmjpeg8.so
+usr/lib/libgdcmcharls.so
usr/lib/gdcm-2.*/*.cmake
usr/include/gdcm-2.*/gdcm*
usr/include/gdcm-2.*/zip*
-usr/include/gdcm-2.*/12/*
-usr/include/gdcm-2.*/16/*
-usr/include/gdcm-2.*/8/*
-usr/include/gdcm-2.*/j*.h
+usr/include/gdcm-2.*/gdcmjpeg/12/*
+usr/include/gdcm-2.*/gdcmjpeg/16/*
+usr/include/gdcm-2.*/gdcmjpeg/8/*
+usr/include/gdcm-2.*/gdcmjpeg/j*.h
+usr/include/gdcm-2.*/gdcmcharls/*.h
Deleted: trunk/packages/gdcm/trunk/debian/patches/gcc44.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gcc44.patch 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/gcc44.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,26 +0,0 @@
-http://gdcm.svn.sf.net/viewvc/gdcm?view=rev&revision=5852
-
---- trunk/Source/Common/zipstreamimpl.hpp 2009/06/19 16:28:41 5851
-+++ trunk/Source/Common/zipstreamimpl.hpp 2009/06/22 09:52:14 5852
-@@ -34,8 +34,6 @@
- when reading deflate bit stream in DICOM special handling of \0 is needed
- also when writing deflate back to disk, the add_footer must be called
- */
--#include <string.h> // memcpy
--#include <stdio.h> // EOF
-
- //*****************************************************************************
- // template class basic_zip_streambuf
---- trunk/Source/Common/zipstreamimpl.h 2009/06/19 16:28:41 5851
-+++ trunk/Source/Common/zipstreamimpl.h 2009/06/22 09:52:14 5852
-@@ -59,6 +59,9 @@
- #include <iostream>
- #include <algorithm>
-
-+#include <string.h> // memcpy
-+#include <stdio.h> // EOF
-+
- #include <gdcm_zlib.h>
-
- #ifdef WIN32 /* Window 95 & Windows NT */
-
Added: trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -0,0 +1,62 @@
+svn rev 6151
+svn rev 6152
+
+--- trunk/Utilities/gdcmcharls/CMakeLists.txt (revision 6145)
++++ trunk/Utilities/gdcmcharls/CMakeLists.txt (working copy)
+@@ -56,14 +56,13 @@
+ RUNTIME DESTINATION ${CHARLS_INSTALL_BIN_DIR} COMPONENT Applications
+ LIBRARY DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Libraries
+ ARCHIVE DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Development
+- ${CPACK_NAMELINK_TYPE}
+ )
+ ENDIF(NOT CHARLS_INSTALL_NO_LIBRARIES)
+
+ IF(NOT CHARLS_INSTALL_NO_DEVELOPMENT)
+ FILE(GLOB header_files "*.h")
+ INSTALL(FILES ${header_files}
+- DESTINATION ${CHARLS_INSTALL_INCLUDE_DIR} COMPONENT Headers
++ DESTINATION ${CHARLS_INSTALL_INCLUDE_DIR}/gdcmcharls COMPONENT Headers
+ )
+ ENDIF(NOT CHARLS_INSTALL_NO_DEVELOPMENT)
+ #add_executable(charlstest test/test.cpp test/time.cpp)
+
+--- trunk/Utilities/gdcmjpeg/12/CMakeLists.txt (revision 6145)
++++ trunk/Utilities/gdcmjpeg/12/CMakeLists.txt (working copy)
+@@ -19,6 +19,6 @@
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+ FILE(GLOB header_files "${CMAKE_CURRENT_BINARY_DIR}/*.h")
+ INSTALL(FILES ${header_files}
+- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/12 COMPONENT Development
++ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg/12 COMPONENT Development
+ )
+ ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+--- trunk/Utilities/gdcmjpeg/16/CMakeLists.txt (revision 6145)
++++ trunk/Utilities/gdcmjpeg/16/CMakeLists.txt (working copy)
+@@ -19,6 +19,6 @@
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+ FILE(GLOB header_files "${CMAKE_CURRENT_BINARY_DIR}/*.h")
+ INSTALL(FILES ${header_files}
+- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/16 COMPONENT Development
++ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg/16 COMPONENT Development
+ )
+ ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+--- trunk/Utilities/gdcmjpeg/8/CMakeLists.txt (revision 6145)
++++ trunk/Utilities/gdcmjpeg/8/CMakeLists.txt (working copy)
+@@ -19,6 +19,6 @@
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+ FILE(GLOB header_files "${CMAKE_CURRENT_BINARY_DIR}/*.h")
+ INSTALL(FILES ${header_files}
+- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/8 COMPONENT Development
++ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg/8 COMPONENT Development
+ )
+ ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+--- trunk/Utilities/gdcmjpeg/CMakeLists.txt (revision 6145)
++++ trunk/Utilities/gdcmjpeg/CMakeLists.txt (working copy)
+@@ -166,6 +166,6 @@
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+ FILE(GLOB header_files "*.h")
+ INSTALL(FILES ${header_files}
+- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
++ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg COMPONENT Headers
+ )
+ ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
Property changes on: trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,25 +0,0 @@
-GDCM ships a customized IJG lib (62 aka 6.b) with the famous lossless patch.
-We will be using GDCM SOVERSION to work around lintian issue.
-
---- gdcm-2.0.10.orig/Utilities/gdcmjpeg/CMakeLists.txt
-+++ gdcm-2.0.10/Utilities/gdcmjpeg/CMakeLists.txt
-@@ -19,17 +19,9 @@
- # Do full dependency headers.
- INCLUDE_REGULAR_EXPRESSION("^.*$")
-
--#-----------------------------------------------------------------------------
--# IJG version number, usefull for packaging and doxygen doc:
--SET(JPEG_MAJOR_VERSION 62) # 62 number version comes from the debian shared lib: /usr/lib/libjpeg.so.62
--SET(JPEG_MINOR_VERSION 1) # bump up the minor version number so that there is no collision
--SET(JPEG_BUILD_VERSION 0)
--SET(JPEG_VERSION
-- "${JPEG_MAJOR_VERSION}.${JPEG_MINOR_VERSION}.${JPEG_BUILD_VERSION}")
--
- SET(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES}
-- VERSION "${JPEG_VERSION}"
-- SOVERSION "${JPEG_MAJOR_VERSION}.${JPEG_MINOR_VERSION}"
-+ VERSION "${GDCM_VERSION}"
-+ SOVERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
- )
-
-
Deleted: trunk/packages/gdcm/trunk/debian/patches/java_covariant_return_type.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/java_covariant_return_type.patch 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/java_covariant_return_type.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,13 +0,0 @@
-Java 1.2 does not have covariant return type. Work around issue
-by removing subclass function
-
---- gdcm-2.0.10.orig/Wrapping/Java/gdcm.i (revision 5856)
-+++ gdcm-2.0.10/Wrapping/Java/gdcm.i (working copy)
-@@ -563,6 +563,7 @@
- //%include "gdcmPythonFilter.h"
- %include "gdcmTagPath.h"
- %include "gdcmPixmapToPixmapFilter.h"
-+%ignore gdcm::ImageToImageFilter::GetOutput() const;
- %include "gdcmImageToImageFilter.h"
- %include "gdcmSOPClassUIDToIOD.h"
- %include "gdcmImageChangeTransferSyntax.h"
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,6 +1 @@
-gdcmjpeg-versioning.patch
-vtk_jar.patch
-share_man.patch
-java_covariant_return_type.patch
-gcc44.patch
-vtk_java_cp.patch
+gdcm_charls_jpeg.patch
Deleted: trunk/packages/gdcm/trunk/debian/patches/share_man.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/share_man.patch 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/share_man.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,13 +0,0 @@
-Integrate upstream patch that defines man in usr/share/man
-
---- gdcm-2.0.10.orig/CMakeLists.txt (revision 5851)
-+++ gdcm-2.0.10/CMakeLists.txt (working copy)
-@@ -215,7 +215,7 @@
- ENDIF(NOT GDCM_INSTALL_DOC_DIR)
-
- IF(NOT GDCM_INSTALL_MAN_DIR)
-- SET(GDCM_INSTALL_MAN_DIR "man")
-+ SET(GDCM_INSTALL_MAN_DIR "share/man")
- ENDIF(NOT GDCM_INSTALL_MAN_DIR)
-
- IF(NOT GDCM_INSTALL_PACKAGE_DIR)
Deleted: trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,89 +0,0 @@
-See debian bug #533193
-
---- gdcm-2-0-12.orig/Wrapping/Csharp/CMakeLists.txt 2009-07-07 15:56:10.000000000 +0200
-+++ gdcm-2-0-12/Wrapping/Csharp/CMakeLists.txt 2009-07-07 15:51:31.000000000 +0200
-@@ -34,7 +34,7 @@
- # Some old swig 1.3 did not support this option:
- #SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}")
-
--SET(CMAKE_SWIG_FLAGS "-namespace gdcm")
-+SET(CMAKE_SWIG_FLAGS "-namespace gdcm -dllimport gdcmsharpglue")
- SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
- # libgdksharpglue.so
- SWIG_ADD_MODULE(gdcmsharpglue csharp gdcm.i)
---- gdcm-2.0.12.orig/Utilities/VTK/CMakeLists.txt (revision 5834)
-+++ gdcm-2.0.12/Utilities/VTK/CMakeLists.txt (working copy)
-@@ -145,9 +159,9 @@
- SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES CPLUSPLUS ON)
- #SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES COMPILE_FLAGS -DUSEACTIVIZ)
- IF(GDCM_USE_ACTIVIZ)
-- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -DUSEACTIVIZ")
-+ SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue -DUSEACTIVIZ")
- ELSE(GDCM_USE_ACTIVIZ)
-- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm")
-+ SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue")
- ENDIF(GDCM_USE_ACTIVIZ)
- SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
- SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
-@@ -227,27 +241,47 @@
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
- VTK_WRAP_JAVA3(${VTKGDCM_NAME}Java vtkgdcmJAVA_SRCS "${vtkgdcm_SRCS}")
-+ # libvtk-java is a pain to handle...
-+ 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})
-+ # 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})
-+ message(FATAL_ERROR "Could not find vtk.jar file")
-+ endif(EXISTS ${GDCM_VTK_JAVA_JAR})
- ADD_LIBRARY(${VTKGDCM_NAME}Java SHARED ${vtkgdcmJAVA_SRCS})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${VTKGDCM_NAME})
- FOREACH(c ${vtkgdcm_LIBS})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${c}Java)
- ENDFOREACH(c)
- # Create the jar file:
-- # I am pretty sure this *.java thingy will byte me one day, when someone will try
-+ # I am pretty sure this *.java thingy will bite me one day, when someone will try
- # to recompile from an existing build tree with invalid generated *.java file...
- ADD_CUSTOM_COMMAND(
- OUTPUT ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
-- COMMAND ${JAVA_COMPILE} ARGS -cp ${VTK_JAVA_JAR} "vtk/*.java"
-+ COMMAND ${JAVA_COMPILE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
- COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar vtk/*.class
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
- DEPENDS ${VTKGDCM_NAME}Java
-- COMMENT "*.java -> jar"
-+ #${VTK_JAVA_DEPENDENCIES}
-+ #vtkgdcmJavaJavaClasses
-+ COMMENT "javac *.java -> jar; jar cvf -> vtkgdcm.jar"
- )
- # Target to execute custom command:
- ADD_CUSTOM_TARGET(VTKGDCMJavaJar ALL
- DEPENDS ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
- COMMENT "building vtkgdcm.jar"
- )
-+ ADD_DEPENDENCIES(VTKGDCMJavaJar vtkgdcmJavaJavaClasses)
-+
- # Install rules:
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
- INSTALL(TARGETS ${VTKGDCM_NAME}Java
-@@ -255,6 +289,10 @@
- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries ${NAMELINK_SKIP}
- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKDevelopment
- )
-+ # because vtkgdcm.jar is constructed with custom commands, it need the INSTALL(FILES signature:
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
-+ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries
-+ )
- ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-
- ELSE(VTK_WRAP_JAVA)
Deleted: trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch 2009-10-27 04:46:27 UTC (rev 4254)
+++ trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch 2009-10-27 14:36:54 UTC (rev 4255)
@@ -1,27 +0,0 @@
-javac does not support -cp, only java does.
-http://gdcm.svn.sf.net/viewvc/gdcm/trunk/Utilities/VTK/CMakeLists.txt?view=patch&r1=5894&r2=5893&pathrev=5894
-
---- trunk/Utilities/VTK/CMakeLists.txt 2009/07/16 10:46:25 5893
-+++ trunk/Utilities/VTK/CMakeLists.txt 2009/07/16 12:23:18 5894
-@@ -255,7 +255,7 @@
- MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR)
- if(EXISTS ${GDCM_VTK_JAVA_JAR})
- else(EXISTS ${GDCM_VTK_JAVA_JAR})
-- message(FATAL_ERROR "Could not find vtk.jar file")
-+ message(FATAL_ERROR "Could not find vtk.jar file, VTK_JAVA_JAR is wrong, please set proper GDCM_VTK_JAVA_JAR replacement var")
- endif(EXISTS ${GDCM_VTK_JAVA_JAR})
- ADD_LIBRARY(${VTKGDCM_NAME}Java SHARED ${vtkgdcmJAVA_SRCS})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${VTKGDCM_NAME})
-@@ -267,7 +267,10 @@
- # to recompile from an existing build tree with invalid generated *.java file...
- ADD_CUSTOM_COMMAND(
- OUTPUT ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
-- COMMAND ${JAVA_COMPILE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
-+ #COMMAND ${JAVA_COMPILE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
-+ # No such thing as -cp for javac only java is listed:
-+ # http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/classpath.html
-+ COMMAND ${JAVA_COMPILE} ARGS -classpath ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
- COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar vtk/*.class
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
- DEPENDS ${VTKGDCM_NAME}Java
-
More information about the debian-med-commit
mailing list