Author: malat-guest Date: 2012-01-01 18:50:10 +0000 (Sun, 01 Jan 2012) New Revision: 9135
Removed: trunk/packages/gdcm/trunk/debian/patches/addvtkgdcmjavaclasspath.patch trunk/packages/gdcm/trunk/debian/patches/dso.patch trunk/packages/gdcm/trunk/debian/patches/fixsitepackage.patch trunk/packages/gdcm/trunk/debian/patches/ptrdiff.patch Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/patches/series Log: Remove patch integrated upstream Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2011-12-31 13:46:10 UTC (rev 9134) +++ trunk/packages/gdcm/trunk/debian/changelog 2012-01-01 18:50:10 UTC (rev 9135) @@ -1,3 +1,9 @@ +gdcm (2.0.19-1) UNRELEASED; urgency=low + + * New upstream + + -- Mathieu Malaterre <[email protected]> Sun, 01 Jan 2012 19:40:54 +0100 + gdcm (2.0.18-7) unstable; urgency=low * Cleanup cmake transitive linking issue with VTK. Closes: #650116 Deleted: trunk/packages/gdcm/trunk/debian/patches/addvtkgdcmjavaclasspath.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/addvtkgdcmjavaclasspath.patch 2011-12-31 13:46:10 UTC (rev 9134) +++ trunk/packages/gdcm/trunk/debian/patches/addvtkgdcmjavaclasspath.patch 2012-01-01 18:50:10 UTC (rev 9135) @@ -1,19 +0,0 @@ -Index: gdcm-2.0.18/Utilities/VTK/manifest.txt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdcm-2.0.18/Utilities/VTK/manifest.txt 2011-09-03 17:30:35.000000000 +0200 -@@ -0,0 +1 @@ -+Class-Path: vtk.jar -Index: gdcm-2.0.18/Utilities/VTK/CMakeLists.txt -=================================================================== ---- gdcm-2.0.18.orig/Utilities/VTK/CMakeLists.txt 2011-09-03 17:30:45.000000000 +0200 -+++ gdcm-2.0.18/Utilities/VTK/CMakeLists.txt 2011-09-03 17:31:27.000000000 +0200 -@@ -366,7 +366,7 @@ - # 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 -+ COMMAND ${JAVA_ARCHIVE} ARGS -cvfm ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt vtk/*.class - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java - DEPENDS ${VTKGDCM_NAME}Java - #${VTK_JAVA_DEPENDENCIES} Deleted: trunk/packages/gdcm/trunk/debian/patches/dso.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/dso.patch 2011-12-31 13:46:10 UTC (rev 9134) +++ trunk/packages/gdcm/trunk/debian/patches/dso.patch 2012-01-01 18:50:10 UTC (rev 9135) @@ -1,12 +0,0 @@ -Index: gdcm-2.0.18/Utilities/VTK/Applications/CMakeLists.txt -=================================================================== ---- gdcm-2.0.18.orig/Utilities/VTK/Applications/CMakeLists.txt 2011-11-08 15:30:59.000000000 +0100 -+++ gdcm-2.0.18/Utilities/VTK/Applications/CMakeLists.txt 2011-11-08 17:42:36.000000000 +0100 -@@ -31,6 +31,7 @@ - SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES}) - ENDIF(GDCM_EXECUTABLE_PROPERTIES) - TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME}) -+ TARGET_LINK_LIBRARIES(${app} vtkCommon vtkFiltering vtkIO vtkImaging) - TARGET_LINK_LIBRARIES(${app} gdcmDSED gdcmMSFF gdcmCommon) - IF(VTK_USE_RENDERING) - TARGET_LINK_LIBRARIES(${app} vtkRendering) Deleted: trunk/packages/gdcm/trunk/debian/patches/fixsitepackage.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/fixsitepackage.patch 2011-12-31 13:46:10 UTC (rev 9134) +++ trunk/packages/gdcm/trunk/debian/patches/fixsitepackage.patch 2012-01-01 18:50:10 UTC (rev 9135) @@ -1,13 +0,0 @@ -Index: gdcm-2.0.18/CMakeLists.txt -=================================================================== ---- gdcm-2.0.18.orig/CMakeLists.txt 2011-09-03 17:33:33.000000000 +0200 -+++ gdcm-2.0.18/CMakeLists.txt 2011-09-03 17:33:38.000000000 +0200 -@@ -53,7 +53,7 @@ - SET(GDCM_EXECUTABLE_PROPERTIES) - IF(GDCM_NO_EXECUTABLE_PROPERTIES) - SET(GDCM_EXECUTABLE_PROPERTIES) -- SET(python_site_package "python/site-packages") -+ SET(python_site_package "python/dist-packages") - ELSE(GDCM_NO_EXECUTABLE_PROPERTIES) - SET(python_site_package "") - ENDIF(GDCM_NO_EXECUTABLE_PROPERTIES) Deleted: trunk/packages/gdcm/trunk/debian/patches/ptrdiff.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/ptrdiff.patch 2011-12-31 13:46:10 UTC (rev 9134) +++ trunk/packages/gdcm/trunk/debian/patches/ptrdiff.patch 2012-01-01 18:50:10 UTC (rev 9135) @@ -1,10 +0,0 @@ ---- gdcm-2.0.17.orig/Wrapping/Python/gdcmswig.i -+++ gdcm-2.0.17/Wrapping/Python/gdcmswig.i -@@ -27,6 +27,7 @@ - // "There is no option to suppress all SWIG warning messages." - #pragma SWIG nowarn=302,303,312,362,383,389,401,503,504,509,510,514,516 - %{ -+#include "stddef.h" - #include "gdcmTypes.h" - #include "gdcmASN1.h" - #include "gdcmSmartPointer.h" Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2011-12-31 13:46:10 UTC (rev 9134) +++ trunk/packages/gdcm/trunk/debian/patches/series 2012-01-01 18:50:10 UTC (rev 9135) @@ -1,6 +1,3 @@ remove_gdcm2pnm.patch -addvtkgdcmjavaclasspath.patch -fixsitepackage.patch toplevelskip.patch #removedocfromall.patch -dso.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
