Author: malat Date: 2014-07-15 14:52:45 +0000 (Tue, 15 Jul 2014) New Revision: 17463
Removed: trunk/packages/vtk-dicom/trunk/debian/patches/current.patch trunk/packages/vtk-dicom/trunk/debian/patches/series trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch Modified: trunk/packages/vtk-dicom/trunk/debian/changelog Log: new release Modified: trunk/packages/vtk-dicom/trunk/debian/changelog =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/changelog 2014-07-15 14:46:35 UTC (rev 17462) +++ trunk/packages/vtk-dicom/trunk/debian/changelog 2014-07-15 14:52:45 UTC (rev 17463) @@ -1,3 +1,12 @@ +vtk-dicom (0.5.2-1) unstable; urgency=low + + * New upstream + * Remove patches applied upstream + - debian/patches/underlink.patch + - debian/patches/current.patch + + -- Mathieu Malaterre <[email protected]> Tue, 15 Jul 2014 16:52:31 +0200 + vtk-dicom (0.5.0-2) unstable; urgency=low * Add missing Conflicts/Replaces. Closes: #753467 Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/current.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/current.patch 2014-07-15 14:46:35 UTC (rev 17462) +++ trunk/packages/vtk-dicom/trunk/debian/patches/current.patch 2014-07-15 14:52:45 UTC (rev 17463) @@ -1,174 +0,0 @@ -Description: import diffs from upstream -Author: David Gobbi <[email protected]> - ---- vtk-dicom-0.5.0.orig/CMakeLists.txt -+++ vtk-dicom-0.5.0/CMakeLists.txt -@@ -351,7 +366,10 @@ if(BUILD_PYTHON_WRAPPERS) - if("${VTK_MAJOR_VERSION}" GREATER 5) - set(LIB_PYTHON_OUTPUT_NAME ${LIB_PYTHON_OUTPUT_NAME}${LIB_NAME_SUFFIX}) - endif() -- set(LIB_PYTHON_LIBS) -+ set(LIB_PYTHON_LIBS vtkPythonCore) -+ if("${VTK_MAJOR_VERSION}" GREATER 5) -+ set(LIB_PYTHON_LIBS vtkWrappingPythonCore) -+ endif() - foreach(TMP_LIB ${VTK_LIBS}) - set(LIB_PYTHON_LIBS ${LIB_PYTHON_LIBS} ${TMP_LIB}PythonD) - endforeach() -@@ -369,11 +387,8 @@ if(BUILD_PYTHON_WRAPPERS) - set_target_properties(${LIB_PYTHON_NAME} PROPERTIES - VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}" - OUTPUT_NAME "${LIB_PYTHON_OUTPUT_NAME}") -- target_link_libraries(${LIB_PYTHON_NAME} ${LIB_NAME} ${LIB_PYTHON_LIBS}) -- # On Win32 and Mac, link python library now, on UNIX, don't -- if(WIN32 OR APPLE) -- target_link_libraries(${LIB_PYTHON_NAME} ${VTK_PYTHON_LIBRARIES}) -- endif() -+ target_link_libraries(${LIB_PYTHON_NAME} -+ ${LIB_NAME} ${LIB_PYTHON_LIBS} ${VTK_PYTHON_LIBRARIES}) - if(USE_DCMTK AND DCMTK_charls_LIBRARY) - target_link_libraries(${LIB_PYTHON_NAME} ${DCMTK_charls_LIBRARY}) - endif() -@@ -400,9 +415,15 @@ if(BUILD_JAVA_WRAPPERS) - find_package(Java REQUIRED) - find_package(JNI REQUIRED) - -+ set(VTK_JAVA_SOURCE_VERSION "1.5" CACHE STRING "javac source version") -+ set(VTK_JAVA_TARGET_VERSION "1.5" CACHE STRING "javac target version") -+ mark_as_advanced(VTK_JAVA_SOURCE_VERSION) -+ mark_as_advanced(VTK_JAVA_TARGET_VERSION) -+ - set(vtk-module ${LIB_NAME}) - set(VTK_WRAP_JAVA3_INIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") - set(VTK_JAVA_HOME ${CMAKE_CURRENT_BINARY_DIR}/java/vtk) -+ set(VTK_JAVA_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/java/manifest.txt) - make_directory(${VTK_JAVA_HOME}) - set(LIB_JAVA_NAME ${LIB_NAME}Java) - set(LIB_JAVA_LIBS) -@@ -455,7 +476,9 @@ if(BUILD_JAVA_WRAPPERS) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt - DEPENDS ${VTK_JAVA_DEPENDENCIES} -- COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -source 1.5 -+ COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -+ -source ${VTK_JAVA_SOURCE_VERSION} -+ -target ${VTK_JAVA_TARGET_VERSION} - -classpath ${VTK_JAVA_JAR}${_sep}${VTK_DIR}/java - -sourcepath ${VTK_DIR}/java/vtk/ - -d ${CMAKE_CURRENT_BINARY_DIR}/java -@@ -464,10 +487,13 @@ if(BUILD_JAVA_WRAPPERS) - -E touch ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt - COMMENT "Compiling Java Classes" - ) -+ file(WRITE ${VTK_JAVA_MANIFEST} "Class-Path: vtk.jar\n") - add_custom_command( -- COMMAND ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtkdicom.jar" -- -C ${CMAKE_CURRENT_BINARY_DIR}/java -- vtk -+ COMMAND ${JAVA_ARCHIVE} -cvfm -+ "${VTK_JAR_PATH}/vtkdicom.jar" -+ ${VTK_JAVA_MANIFEST} -+ -C ${CMAKE_CURRENT_BINARY_DIR}/java -+ vtk - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES} - OUTPUT ${VTK_JAR_PATH}/vtkdicom.jar - COMMENT "Java Archive" ---- vtk-dicom-0.5.0.orig/Testing/CMakeLists.txt -+++ vtk-dicom-0.5.0/Testing/CMakeLists.txt -@@ -64,8 +64,10 @@ if(BUILD_JAVA_WRAPPERS) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/javac_test_stamp.txt - COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -+ -source ${VTK_JAVA_SOURCE_VERSION} -+ -target ${VTK_JAVA_TARGET_VERSION} - -classpath "${VTK_JAR_PATH}/vtkdicom.jar${_sep}${DICOM_BINARY_DIR}/java${_sep}${VTK_JAVA_JAR}" -- -source 1.5 -sourcepath ${CMAKE_CURRENT_SOURCE_DIR} -+ -sourcepath ${CMAKE_CURRENT_SOURCE_DIR} - -d ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/TestDICOMJava.java - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/javac_test_stamp.txt ---- vtk-dicom-0.5.0.orig/Testing/TestDICOMJava.java.in -+++ vtk-dicom-0.5.0/Testing/TestDICOMJava.java.in -@@ -4,12 +4,51 @@ import vtk.vtkDICOMMetaData; - import vtk.vtkObject; - import vtk.vtkIntArray; - import vtk.vtkJavaTesting; -+import vtk.vtkSettings; - - import java.io.File; - - public class TestDICOMJava { - public static void main(final String[] args) { -- vtkJavaTesting.Initialize(args, false); -+ // try loading the VTK libs from the VTK build directory -+ try { -+ String[] kits = vtkSettings.GetKits(); -+ String vtk5libs[] = { -+ "vtkCommonJava", "vtkFilteringJava", "vtkImagingJava", -+ "vtkGraphicsJava", "vtkIOJava" -+ }; -+ String vtk6libs[] = { -+ "vtkCommonCoreJava", "vtkCommonDataModelJava", -+ "vtkIOImageJava", "vtkIOMPIImageJava" -+ }; -+ int cc; -+ for (cc = 0; cc < kits.length; cc++) { -+ String libname = "vtk" + kits[cc] + "Java"; -+ boolean found = false; -+ int i; -+ for (i = 0; i < vtk5libs.length; i++) { -+ if (libname.equals(vtk5libs[i])) { -+ found = true; -+ break; -+ } -+ } -+ for (i = 0; i < vtk6libs.length; i++) { -+ if (libname.equals(vtk6libs[i])) { -+ found = true; -+ break; -+ } -+ } -+ if (found) { -+ Runtime.getRuntime().loadLibrary(libname); -+ } -+ } -+ } -+ catch (UnsatisfiedLinkError ee) { -+ // try using VTK's own load function instead -+ vtkJavaTesting.Initialize(args, false); -+ } -+ -+ // load the vtkDICOMJava lib - String sep = System.getProperty("file.separator"); - String lname = System.mapLibraryName("vtkDICOMJava"); - String lpath = "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"; -@@ -33,6 +72,7 @@ public class TestDICOMJava { - vtkDICOMReader reader = new vtkDICOMReader(); - vtkDICOMWriter writer = new vtkDICOMWriter(); - vtkDICOMMetaData meta = new vtkDICOMMetaData(); -+ writer.SetInputConnection(reader.GetOutputPort()); - vtkIntArray a = new vtkIntArray(); - vtkObject.JAVA_OBJECT_MANAGER.deleteAll(); - System.out.println("Ran the vtk-dicom Java test."); ---- vtk-dicom-0.5.0.orig/vtkDICOMValue.h -+++ vtk-dicom-0.5.0/vtkDICOMValue.h -@@ -185,7 +185,7 @@ public: - * the number of binary values will be returned. - * - for UN, the number of bytes will be returned. - * - for attribute tags (VR is AT) the number of tags will be returned. -- * - for sequences (SQ and XQ) the number of items in the sequence, -+ * - for sequences (SQ) the number of items in the sequence, - * excluding any delimeters, will be returned. - */ - size_t GetNumberOfValues() const { ---- vtk-dicom-0.5.0.orig/vtkNIFTIHeader.h -+++ vtk-dicom-0.5.0/vtkNIFTIHeader.h -@@ -273,7 +273,7 @@ public: - const char *GetDescrip() { return this->Descrip; } - - // Description: -- // Get an auxilliary file, e.g. a color table, that is associated -+ // Get an auxiliary file, e.g. a color table, that is associated - // with this data. The length of the filename must be a maximum of - // 24 characters, and it will be assumed to be in the same directory - // as the NIFTI file. Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/series =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/series 2014-07-15 14:46:35 UTC (rev 17462) +++ trunk/packages/vtk-dicom/trunk/debian/patches/series 2014-07-15 14:52:45 UTC (rev 17463) @@ -1,2 +0,0 @@ -current.patch -underlink.patch Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch 2014-07-15 14:46:35 UTC (rev 17462) +++ trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch 2014-07-15 14:52:45 UTC (rev 17463) @@ -1,24 +0,0 @@ -Description: fix underlinking issues -Author: Mathieu Malaterre <[email protected]> -Forwarded: no - -Index: vtk-dicom-0.5.0/CMakeLists.txt -=================================================================== ---- vtk-dicom-0.5.0.orig/CMakeLists.txt 2014-07-04 11:42:27.000000000 +0200 -+++ vtk-dicom-0.5.0/CMakeLists.txt 2014-07-04 11:44:03.578842062 +0200 -@@ -334,6 +334,7 @@ - - # Wrappers - if(BUILD_PYTHON_WRAPPERS) -+ find_package(PythonLibs REQUIRED) - set(vtk-module ${LIB_NAME}) - set(XY) # Get python version, e.g. 27 for python 2.7 - if(vtkPython_LIBRARIES) -@@ -374,6 +375,7 @@ - OUTPUT_NAME "${LIB_PYTHON_OUTPUT_NAME}") - target_link_libraries(${LIB_PYTHON_NAME} - ${LIB_NAME} ${LIB_PYTHON_LIBS} ${VTK_PYTHON_LIBRARIES}) -+ target_link_libraries(${LIB_PYTHON_NAME} ${PYTHON_LIBRARY}) - if(USE_DCMTK AND DCMTK_charls_LIBRARY) - target_link_libraries(${LIB_PYTHON_NAME} ${DCMTK_charls_LIBRARY}) - endif() _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
