[med-svn] r12241 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu Sep 20 12:32:39 UTC 2012
Author: malat
Date: 2012-09-20 12:32:38 +0000 (Thu, 20 Sep 2012)
New Revision: 12241
Removed:
trunk/packages/gdcm/trunk/debian/gdcm-doc.install
trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch
trunk/packages/gdcm/trunk/debian/patches/doxygen_svg.patch
trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch
trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch
trunk/packages/gdcm/trunk/debian/patches/fixundef.patch
trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch
trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch
trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch
trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch
trunk/packages/gdcm/trunk/debian/patches/removetransitivepython.patch
trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch
trunk/packages/gdcm/trunk/debian/patches/stableapi.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/control.in
trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base
trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
trunk/packages/gdcm/trunk/debian/rules
Log:
Update for next release
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/changelog 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,3 +1,22 @@
+gdcm (2.2.1-1) unstable; urgency=low
+
+ * New upstream: 2.2.1
+ Remove patches applied upstream:
+ - removedocfromall.patch
+ - fixgcj.patch
+ - fixgcj2.patch
+ - stableapi.patch
+ - activiz.net.patch
+ - kfreebsdfix.patch
+ - removepythonlink.patch
+ - fixundef.patch
+ - removesonamepython.patch
+ - sonameprops.patch
+ - csharpfixes.patch
+ - removetransitivepython.patch
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 20 Sep 2012 11:06:19 +0200
+
gdcm (2.2.0-13) unstable; urgency=medium
[ Andreas Tille ]
Modified: trunk/packages/gdcm/trunk/debian/control.in
===================================================================
--- trunk/packages/gdcm/trunk/debian/control.in 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/control.in 2012-09-20 12:32:38 UTC (rev 12241)
@@ -7,7 +7,7 @@
Steve M. Robbins <smr at debian.org>
Build-Depends: debhelper (>= 9), python-all-dev, libvtk-java, pvrg-jpeg,
uuid-dev, libz-dev, libexpat-dev, doxygen-latex, ghostscript,
- swig (>= 2.0.5), cmake (>= 2.6.2), libvtk5-dev, libcharls-dev, javahelper,
+ swig (>= 2.0.7), cmake (>= 2.6.2), libvtk5-dev, libcharls-dev, javahelper,
libopenjpeg-dev, graphviz, default-jdk, php5-dev, php5-cli,
libpoppler-private-dev, libssl-dev, python-vtk, gccxml,
libactiviz.net-cil [@DEB_MONO_ARCHS@],
@@ -15,7 +15,7 @@
cli-common-dev (>= 0.8~) [@DEB_MONO_ARCHS@],
mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@]
Build-Depends-Indep: vtk-doc
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
X-Python-Version: @PYVER@
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/gdcm/trunk/
Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base 2012-09-20 12:32:38 UTC (rev 12241)
@@ -9,4 +9,4 @@
Files: /usr/share/doc/gdcm-doc/html/*
Format: PDF
-Files: /usr/share/doc/gdcm-doc/gdcm-2.2.0.pdf
+Files: /usr/share/doc/gdcm-doc/gdcm-2.2.1.pdf
Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,2 +1,2 @@
usr/share/doc/gdcm-*/html/
-usr/share/doc/gdcm-*/gdcm-2.2.0.pdf
+usr/share/doc/gdcm-*/gdcm-2.2.1.pdf
Deleted: trunk/packages/gdcm/trunk/debian/gdcm-doc.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.install 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.install 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,2 +0,0 @@
-usr/share/doc/gdcm-*/html
-usr/share/doc/gdcm-*/gdcm-2.2.0.pdf
Deleted: trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,751 +0,0 @@
-Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-01-24 11:55:34.000000000 +0100
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-01-24 11:56:43.000000000 +0100
-@@ -126,28 +126,7 @@
- #ENDIF(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
-
- SET_TARGET_PROPERTIES(${VTKGDCM_NAME} PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
--IF(GDCM_USE_ACTIVIZ AND UNIX)
-- # the following only works with Activiz VTK 5.4.2. The pure VTK lib are now shipped as separate libs.
-- # so one can safely link to them, instead of having to build a VTK by hand, link vtkgdcm to it
-- # and hope compiler configuration are compatible.
-- # if you use Activiz/VTK 5.2.1 you are on your own (see gdcm 2.0.12 which supports Activiz 5.2.1)
-- FIND_PACKAGE(ACTIVIZ REQUIRED)
-- #message(${ACTIVIZ_KITWARE_VTK_LIBRARY})
-- get_filename_component(bla ${ACTIVIZ_KITWARE_VTK_LIBRARY}
-- PATH)
--
-- #LINK_DIRECTORIES(${bla})
-- #TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF
-- # ${bla}/libvtkCommon.so
-- # #${bla}/libvtkIO.so
-- # ${bla}/libvtkImaging.so
-- # ${bla}/libvtkRendering.so
-- # )
-- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
--ELSE(GDCM_USE_ACTIVIZ AND UNIX)
-- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
--ENDIF(GDCM_USE_ACTIVIZ AND UNIX)
--
-+TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
- # prevent viral dep of vtkgdcm
- SET_PROPERTY(TARGET ${VTKGDCM_NAME} PROPERTY LINK_INTERFACE_LIBRARIES "")
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-@@ -182,10 +161,10 @@
- MESSAGE(FATAL_ERROR "you need a newer VTK version >= 5.0")
- ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
-
--FIND_PACKAGE(PHP5 REQUIRED)
--INCLUDE_DIRECTORIES(
-- ${PHP5_INCLUDE_PATH}
--)
-+ FIND_PACKAGE(PHP5 REQUIRED)
-+ INCLUDE_DIRECTORIES(
-+ ${PHP5_INCLUDE_PATH}
-+ )
-
- FIND_PACKAGE(SWIG REQUIRED)
- MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
-@@ -249,69 +228,346 @@
- IF(GDCM_USE_ACTIVIZ)
- FIND_PACKAGE(ACTIVIZ REQUIRED)
- ELSE(GDCM_USE_ACTIVIZ)
-- MESSAGE("You are using the SWIG version of VTKGDCM. This is not compatible with Activiz")
-+ MESSAGE(STATUS "You are using the SWIG version of VTKGDCM. This is not compatible with Activiz")
-+ FIND_PACKAGE(SWIG REQUIRED)
-+ MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
-+ INCLUDE(${SWIG_USE_FILE})
-+ SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES CPLUSPLUS ON)
-+ #SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES COMPILE_FLAGS -DUSEACTIVIZ)
- ENDIF(GDCM_USE_ACTIVIZ)
-- FIND_PACKAGE(SWIG REQUIRED)
-- MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
-- INCLUDE(${SWIG_USE_FILE})
-- 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 -dllimport vtkgdcmsharpglue -DUSEACTIVIZ")
-+ #SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue -DUSEACTIVIZ")
- ELSE(GDCM_USE_ACTIVIZ)
-- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue")
-+ SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue")
-+ SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
-+ SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
-+ SWIG_LINK_LIBRARIES(vtkgdcmsharpglue vtkgdcm)
-+ # Stupid cmake-swig module is doing that for us, when not needed
-+ IF(UNIX)
-+ SET_TARGET_PROPERTIES(${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME} PROPERTIES PREFIX "lib")
-+ ENDIF(UNIX)
-+ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-+ INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
-+ EXPORT ${GDCM_TARGETS_NAME}
-+ RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Applications
-+ LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries #${NAMELINK_SKIP}
-+ ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
-+ )
-+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
- ENDIF(GDCM_USE_ACTIVIZ)
-- SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
-- SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
-- SWIG_LINK_LIBRARIES(vtkgdcmsharpglue vtkgdcm)
-- # Stupid cmake-swig module is doing that for us, when not needed
-- IF(UNIX)
-- SET_TARGET_PROPERTIES(${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME} PROPERTIES PREFIX "lib")
-- ENDIF(UNIX)
-
--IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-- INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
-- EXPORT ${GDCM_TARGETS_NAME}
-- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Applications
-- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries #${NAMELINK_SKIP}
-- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
-- )
--#if(NAMELINK_ONLY)
--# INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
--# LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
--# )
--# endif(NAMELINK_ONLY)
--
--ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-- CONFIGURE_FILE(
-- ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
-- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
-- @ONLY)
- CONFIGURE_FILE(
- ${GDCM_SOURCE_DIR}/Wrapping/Csharp/key.snk
- ${CMAKE_CURRENT_BINARY_DIR}/key.snk
- COPYONLY)
-+
- IF(GDCM_USE_ACTIVIZ)
-- ADD_CUSTOM_COMMAND(
-- OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/r:${ACTIVIZ_KITWARE_VTK_LIBRARY}" "/r:${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY}" "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-- #COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-- DEPENDS "${swig_generated_file_fullname}"
-- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
-- COMMENT "csc *.cs"
-- )
-+ FIND_PACKAGE(Mummy REQUIRED)
-+ IF(NOT Mummy_BASE_DIR)
-+ MESSAGE(FATAL_ERROR "error: Mummy_BASE_DIR not defined. Please set Mummy_DIR to the directory containing MummyConfig.cmake")
-+ ENDIF(NOT Mummy_BASE_DIR)
-+ INCLUDE("${Mummy_DIR}/MummyCMakeMacros.cmake")
-+ IF(NOT mummy_EXECUTABLE)
-+ FIND_PROGRAM(mummy_EXECUTABLE mummy)
-+ ENDIF(NOT mummy_EXECUTABLE)
-+ IF(NOT mummy_EXECUTABLE)
-+ MESSAGE(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
-+ ENDIF(NOT mummy_EXECUTABLE)
-+
-+ IF(NOT gccxml_EXECUTABLE)
-+ FIND_PROGRAM(gccxml_EXECUTABLE gccxml)
-+ ENDIF(NOT gccxml_EXECUTABLE)
-+ IF(NOT gccxml_EXECUTABLE)
-+ MESSAGE(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
-+ ENDIF(NOT gccxml_EXECUTABLE)
-+ SET(gccxml_compiler "${CMAKE_CXX_COMPILER}")
-+ IF(MSVC80)
-+ SET(gccxml_compiler "msvc8")
-+ ENDIF(MSVC80)
-+ IF(MSVC90)
-+ SET(gccxml_compiler "msvc9")
-+ ENDIF(MSVC90)
-+ #MESSAGE(STATUS "gccxml_compiler='${gccxml_compiler}'...")
-+ SET(gccxml_include_args "")
-+ FOREACH(dir ${Mummy_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS})
-+ SET(gccxml_include_args ${gccxml_include_args} "-I${dir}")
-+ ENDFOREACH(dir)
-+ CONFIGURE_FILE(
-+ "${CMAKE_CURRENT_SOURCE_DIR}/MummySettings.xml.in"
-+ "${CMAKE_CURRENT_BINARY_DIR}/xml/MummySettings.xml"
-+ @ONLY
-+ )
-+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/csharp")
-+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/export-layer")
-+
-+ set(theclasslist
-+ vtkGDCMImageReader
-+ vtkGDCMImageWriter
-+ vtkGDCMMedicalImageProperties
-+ vtkGDCMPolyDataReader
-+ vtkGDCMPolyDataWriter
-+ vtkGDCMTesting
-+ vtkGDCMThreadedImageReader
-+ vtkGDCMThreadedImageReader2
-+ vtkImageColorViewer
-+ vtkImageMapToColors16
-+ vtkImageMapToWindowLevelColors2
-+ #vtkImagePlanarComponentsToComponents
-+ vtkImageRGBToYBR
-+ vtkImageYBRToRGB
-+ vtkLookupTable16
-+ vtkRTStructSetProperties
-+ )
-+ SET(kits gdcm)
-+ # foreach kit
-+ set(kit gdcm)
-+ FOREACH(class ${theclasslist})
-+ IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-+ #SET(header "${VTK_${ukit}_HEADER_DIR}/${class}.h")
-+ SET(header "${CMAKE_CURRENT_SOURCE_DIR}/${class}.h")
-+ SET(cxxclass "${class}")
-+
-+ # handle full paths
-+ IF("${class}" MATCHES "^(\\/|.\\/|.\\\\|.:\\/|.:\\\\)")
-+ SET(header "${class}.h")
-+ STRING(REGEX MATCH "[^/]*$" cxxclass "${class}")
-+
-+ GET_FILENAME_COMPONENT(dir "${header}" PATH)
-+ INCLUDE_DIRECTORIES("${dir}")
-+ ENDIF("${class}" MATCHES "^(\\/|.\\/|.\\\\|.:\\/|.:\\\\)")
-+
-+ SET(abstract 0)
-+ IF(VTK_CLASS_ABSTRACT_${class})
-+ SET(abstract 1)
-+ SET_SOURCE_FILES_PROPERTIES(${header} PROPERTIES ABSTRACT 1)
-+ ENDIF(VTK_CLASS_ABSTRACT_${class})
-+
-+ # Build one master in-memory table so that we don't have to re-do all the
-+ # logic in this nested FOREACH loop later on... Instead we'll simply iterate
-+ # the in-memory table built here:
-+ #
-+ SET(WRAPPED_CLASS_TABLE ${WRAPPED_CLASS_TABLE} "${cxxclass} ${kit} ${abstract} ${header}")
-+
-+
-+ SET(include_source_text "")
-+ STRING(REGEX REPLACE "(.*).h" "\\1.cxx" source "${header}")
-+ IF(EXISTS "${source}")
-+ SET(include_source_text "#include \"${source}\"")
-+ ELSE(EXISTS "${source}")
-+ #MESSAGE(FATAL_ERROR "error: Source file '${source}' does not exist...")
-+ ENDIF(EXISTS "${source}")
-+
-+ CONFIGURE_FILE(
-+ "${CMAKE_CURRENT_SOURCE_DIR}/gccxml.cxx.in"
-+ "${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx"
-+ @ONLY
-+ )
-+
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+ COMMAND ${gccxml_EXECUTABLE}
-+ ARGS
-+ -fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+ -fxml-start=_cable_
-+ ${gccxml_include_args} -DCABLE_CONFIGURATION
-+ --gccxml-compiler ${gccxml_compiler}
-+ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
-+ DEPENDS
-+ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
-+ ${header}
-+ ${gccxml_EXECUTABLE}
-+ )
-+
-+#
-+# *before* custom command re-arranging:
-+#
-+# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs
-+# ${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx
-+#
-+# Do not list the *.cs or *EL.cxx files as outputs of this custom command.
-+# If you do, the custom command chains out into other targets rather than
-+# being defined solely in the "generate wrappers" custom target.
-+#
-+# The output of this command is the generated sentinel file that the
-+# "generate wrappers" target depends on. The other files are generated as an
-+# intentional "side effect" and after the target is done building, the other
-+# targets that build the generated source code may build... That is controlled
-+# by target level dependencies to reduce complexity.
-+#
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt
-+ COMMAND ${mummy_EXECUTABLE}
-+ --suppress-warnings 6005 6006 6009 6010 6012 6013 6015 6016 6017 6018 6019
-+ --settings-file ${CMAKE_CURRENT_BINARY_DIR}/xml/MummySettings.xml
-+ --gccxml-file ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+ --csharp-file ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs
-+ --export-layer-file ${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx
-+ COMMAND ${CMAKE_COMMAND} -E touch
-+ ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt
-+ DEPENDS
-+ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+ ${CMAKE_CURRENT_BINARY_DIR}/xml/MummySettings.xml
-+ ${mummy_EXECUTABLE}
-+ ${${cxxclass}_EXTRA_DEPENDENCIES}
-+ )
-+
-+ SET(${kit}_EL_SOURCES ${${kit}_EL_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx")
-+ SET(ALLKITS_EL_SOURCES ${ALLKITS_EL_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx")
-+
-+ SET(${kit}_CS_SOURCES ${${kit}_CS_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs")
-+ SET(ALLKITS_CS_SOURCES ${ALLKITS_CS_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs")
-+
-+ SET(${kit}_SENTINELS ${${kit}_SENTINELS} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt")
-+ SET(ALLKITS_SENTINELS ${ALLKITS_SENTINELS} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt")
-+ ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-+ ENDFOREACH(class)
-+
-+ ADD_CUSTOM_TARGET(
-+ "vtk${kit}GenerateWrappers" ALL
-+ DEPENDS ${${kit}_SENTINELS}
-+ )
-+ SET_SOURCE_FILES_PROPERTIES(
-+ ${ALLKITS_EL_SOURCES}
-+ ${ALLKITS_CS_SOURCES}
-+ PROPERTIES GENERATED 1)
-+
-+ IF(VTK_BUILD_SHARED_LIBS)
-+ SET(MV_ONE_EXPORT_LAYER_DLL 0)
-+ ELSE(VTK_BUILD_SHARED_LIBS)
-+ SET(MV_ONE_EXPORT_LAYER_DLL 1)
-+ ENDIF(VTK_BUILD_SHARED_LIBS)
-+
-+ IF(MV_ONE_EXPORT_LAYER_DLL)
-+ message(FATAL_ERROR "Unimplemented")
-+ #SET(AVDN_INSTALL_TARGETS ${AVDN_INSTALL_TARGETS} "Kitware.VTK.Unmanaged")
-+ #ADD_LIBRARY(Kitware.VTK.Unmanaged SHARED ${ALLKITS_EL_SOURCES})
-+ #SET(unmanaged_targets ${unmanaged_targets} "Kitware.VTK.Unmanaged")
-+ #SET(unmanaged_dlls ${unmanaged_dlls} "${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+ #IF(WIN32)
-+ # TARGET_LINK_LIBRARIES(Kitware.VTK.Unmanaged "${exe_dir}/Kitware.mummy.Runtime.Unmanaged.lib")
-+ #ELSE(WIN32)
-+ # TARGET_LINK_LIBRARIES(Kitware.VTK.Unmanaged "${exe_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.mummy.Runtime.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+ #ENDIF(WIN32)
-+ ## TODO -- rename this CopyLibraries here too...
-+ #ADD_DEPENDENCIES(Kitware.VTK.Unmanaged Kitware.mummy.CopyLibraries2)
-+ #FOREACH(kit ${kits})
-+ # TARGET_LINK_LIBRARIES(Kitware.VTK.Unmanaged vtk${kit})
-+ # ADD_DEPENDENCIES(Kitware.VTK.Unmanaged "vtk${kit}GenerateWrappers")
-+ #ENDFOREACH(kit)
-+ ELSE(MV_ONE_EXPORT_LAYER_DLL)
-+ INCLUDE_DIRECTORIES(${Mummy_INCLUDE_DIRS})
-+ FOREACH(kit ${kits})
-+ SET(AVDN_INSTALL_TARGETS ${AVDN_INSTALL_TARGETS} "Kitware.VTK.vtk${kit}.Unmanaged")
-+ ADD_LIBRARY(Kitware.VTK.vtk${kit}.Unmanaged SHARED ${${kit}_EL_SOURCES})
-+ SET(unmanaged_targets ${unmanaged_targets} "Kitware.VTK.vtk${kit}.Unmanaged")
-+ SET(unmanaged_dlls ${unmanaged_dlls} "${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.vtk${kit}.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+ IF(WIN32)
-+ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged "${exe_dir}/Kitware.mummy.Runtime.Unmanaged.lib")
-+ ELSE(WIN32)
-+ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged ${Mummy_RUNTIME_LINK_LIBRARIES})
-+ ENDIF(WIN32)
-+ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtk${kit})
-+ # TODO -- rename this CopyLibraries here too...
-+ ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged Kitware.mummy.CopyLibraries2)
-+ ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged "vtk${kit}GenerateWrappers")
-+ ENDFOREACH(kit)
-+ ENDIF(MV_ONE_EXPORT_LAYER_DLL)
-+
-+ set(csc_EXECUTABLE ${CMAKE_CSHARP_COMPILER})
-+ # Set list of export-layer dlls in C# syntax as CMake variable
-+ # MV_EXPORTLAYER_DLL_VARIABLES. This gets configured into
-+ # WrappedObject.cs below.
-+ #
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "")
-+ FOREACH(kit ${kits})
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// <summary>\n")
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// Export layer functions for 'vtk${kit}' are exported from\n")
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// the DLL named by the value of this variable.\n")
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// </summary>\n")
-+
-+ IF(MV_ONE_EXPORT_LAYER_DLL)
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} public const string vtk${kit}EL_dll = \"${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}\";\n")
-+ ELSE(MV_ONE_EXPORT_LAYER_DLL)
-+ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} public const string vtk${kit}EL_dll = \"${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.vtk${kit}.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}\";\n")
-+ ENDIF(MV_ONE_EXPORT_LAYER_DLL)
-+ ENDFOREACH(kit)
-+
-+ SET(csharp_namespace "Kitware.VTK.GDCM")
-+ CONFIGURE_FILE(
-+ "${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in"
-+ "${CMAKE_CURRENT_BINARY_DIR}/csharp/AssemblyInfo.cs"
-+ @ONLY
-+ )
-+
-+ SET(ALLKITS_CS_SOURCES
-+ ${ALLKITS_CS_SOURCES}
-+ "${CMAKE_CURRENT_BINARY_DIR}/csharp/AssemblyInfo.cs"
-+ )
-+
-+ SET(AVDN_VTK_CSC_REFS ${ACTIVIZ_KITWARE_VTK_LIBRARY} ${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY})
-+ ADD_CSHARP_LIBRARY(
-+ "Kitware.VTK.GDCM" # name of library
-+ "${unmanaged_targets}" # list of CMake targets that need to build first
-+ "${AVDN_VTK_CSC_REFS}" # list of csc "/reference:" args
-+ "${unmanaged_dlls}" # list of csc "/linkresource:" args
-+ "${AVDN_SNKEYFILE}" # strong name signing keyfile
-+ # Source files:
-+ ${ALLKITS_CS_SOURCES}
-+ )
-+
-+ FOREACH(kit ${kits})
-+ ADD_DEPENDENCIES(Kitware.VTK.GDCM "vtk${kit}GenerateWrappers")
-+ ENDFOREACH(kit)
-+
-+ # ADD_CUSTOM_COMMAND(
-+ # OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-+ # COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/r:${ACTIVIZ_KITWARE_VTK_LIBRARY}" "/r:${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY}" "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-+ # #COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-+ # WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ # DEPENDS "${swig_generated_file_fullname}"
-+ # ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
-+ # COMMENT "csc *.cs"
-+ # )
-+
-+ INSTALL(FILES
-+ ${GDCM_LIBRARY_DIR}/Kitware.VTK.GDCM.dll
-+ ${GDCM_LIBRARY_DIR}/Kitware.VTK.GDCM.xml
-+ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKCSharpModule
-+ )
-+ INSTALL(TARGETS Kitware.VTK.vtk${kit}.Unmanaged
-+ EXPORT ${GDCM_TARGETS_NAME}
-+ RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT VTKLibraries
-+ LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries #${NAMELINK_SKIP}
-+ ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKDevelopment
-+ )
- ELSE(GDCM_USE_ACTIVIZ)
-- ADD_CUSTOM_COMMAND(
-- OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-- #COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/r:${ACTIVIZ_KITWARE_VTK_LIBRARY}" "/r:${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY}" "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-- DEPENDS "${swig_generated_file_fullname}"
-+ CONFIGURE_FILE(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
-- COMMENT "csc *.cs"
-- )
-+ @ONLY)
-
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-+ COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ DEPENDS "${swig_generated_file_fullname}"
-+ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
-+ COMMENT "csc *.cs"
-+ )
-+ ADD_CUSTOM_TARGET(VTKGDCMCSharp ALL
-+ DEPENDS
-+ ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-+ #${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll.config
-+ #${GDCM_EXECUTABLE_DIR}/HelloWorld.exe
-+ COMMENT "building vtkgdcm-sharp.dll"
-+ )
-+ # because vtkgdcm-sharp.dll is constructed with custom commands, it need the INSTALL(FILES signature:
-+ SET(GDCM_LIBRARY_DIR2 ${LIBRARY_OUTPUT_PATH}/\${BUILD_TYPE})
-+ INSTALL(FILES
-+ ${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll
-+ #${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll.config
-+ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKCSharpModule
-+ )
- ENDIF(GDCM_USE_ACTIVIZ)
-
- #ADD_CUSTOM_COMMAND(
-@@ -321,22 +577,6 @@
- # COMMENT "Copying vtkgdcm-sharp.dll.config"
- #)
-
--ADD_CUSTOM_TARGET(VTKGDCMCSharp ALL
-- DEPENDS
-- ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-- #${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll.config
-- #${GDCM_EXECUTABLE_DIR}/HelloWorld.exe
-- COMMENT "building vtkgdcm-sharp.dll"
--)
--
-- # because vtkgdcm-sharp.dll is constructed with custom commands, it need the INSTALL(FILES signature:
--SET(GDCM_LIBRARY_DIR2 ${LIBRARY_OUTPUT_PATH}/\${BUILD_TYPE})
-- INSTALL(FILES
-- ${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll
-- #${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll.config
-- DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKCSharpModule
-- )
--
- ENDIF(GDCM_WRAP_CSHARP)
-
- IF(GDCM_WRAP_JAVA)
-@@ -360,7 +600,7 @@
- endif(EXISTS ${VTK_JAVA_JAR})
- if(EXISTS /usr/lib/jni/libvtkCommonJava.so)
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533198
-- message("Implicitely adding debian package layout...")
-+ message(STATUS "Implicitely adding debian package layout...")
- link_directories("/usr/lib/jni")
- endif()
- MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR)
-@@ -422,7 +662,7 @@
- ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-
- ELSE(VTK_WRAP_JAVA)
-- MESSAGE("GDCM_WRAP_JAVA canot be build without VTK_WRAP_JAVA")
-+ MESSAGE(STATUS "GDCM_WRAP_JAVA canot be build without VTK_WRAP_JAVA")
- ENDIF(VTK_WRAP_JAVA)
- ENDIF(GDCM_WRAP_JAVA)
-
-@@ -491,7 +731,7 @@
- ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
-
- ELSE(VTK_WRAP_PYTHON)
-- MESSAGE("GDCM_WRAP_PYTHON canot be build without VTK_WRAP_PYTHON")
-+ MESSAGE(STATUS "GDCM_WRAP_PYTHON canot be build without VTK_WRAP_PYTHON")
- ENDIF(VTK_WRAP_PYTHON)
- ENDIF(GDCM_WRAP_PYTHON)
-
-Index: gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in 2012-01-24 11:56:43.000000000 +0100
-@@ -0,0 +1 @@
-+ at CscArgs@
-Index: gdcm-2.2.0/Utilities/VTK/dllexportconf.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/dllexportconf.cs 2012-01-24 11:56:43.000000000 +0100
-@@ -0,0 +1 @@
-+public const string vtkgdcmEL_dll = "libKitware.VTK.vtkgdcm.Unmanaged.so";
-Index: gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in 2012-01-24 11:56:43.000000000 +0100
-@@ -0,0 +1,16 @@
-+#include "@header@"
-+
-+#ifdef CABLE_CONFIGURATION
-+namespace _cable_
-+{
-+ const char* const package = "Kitware.VTK.GDCM";
-+ const char* const package_version = "@VTK_MAJOR_VERSION at .@VTK_MINOR_VERSION at .@VTK_BUILD_VERSION@";
-+ const char* const group = "vtk at kit@";
-+
-+ namespace wrappers
-+ {
-+ typedef @cxxclass@ @cxxclass at _W;
-+ }
-+
-+}
-+#endif
-Index: gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in 2012-01-24 11:56:43.000000000 +0100
-@@ -0,0 +1,196 @@
-+<MummySettings>
-+
-+ <!-- Individual classes to exclude from wrapped layers -->
-+ <!-- (These VTK classes are not included in the list of wrapped classes
-+ that comes out of VTK's CMake info...) -->
-+
-+ <Class name="vtkAbstractContextBufferId" wrappable="false"/>
-+ <Class name="vtkAMRBox" wrappable="false"/>
-+ <Class name="vtkArrayCoordinates" wrappable="false"/>
-+ <Class name="vtkArrayExtents" wrappable="false"/>
-+ <Class name="vtkArrayRange" wrappable="false"/>
-+ <Class name="vtkBoundingBox" wrappable="false"/>
-+ <Class name="vtkCallbackCommand" wrappable="false"/>
-+ <Class name="vtkColor3ub" wrappable="false"/>
-+ <Class name="vtkColor4ub" wrappable="false"/>
-+ <Class name="vtkContextKeyEvent" wrappable="false"/>
-+ <Class name="vtkContextMouseEvent" wrappable="false"/>
-+ <Class name="vtkContourRepresentationNode" wrappable="false"/>
-+ <Class name="vtkEdgeType" wrappable="false"/>
-+ <Class name="vtkExodusIICacheKey" wrappable="false"/>
-+ <Class name="vtkImageComplex" wrappable="false"/>
-+ <Class name="vtkImageConnectorSeed" wrappable="false"/>
-+ <Class name="vtkIndent" wrappable="false"/>
-+ <Class name="vtkInEdgeType" wrappable="false"/>
-+ <Class name="vtkInterpolationInfo" wrappable="false"/>
-+ <Class name="vtkInterpolationWeights" wrappable="false"/>
-+ <Class name="vtkMultiProcessStream" wrappable="false"/>
-+ <Class name="vtkOBBNode" wrappable="false"/>
-+ <Class name="vtkOutEdgeType" wrappable="false"/>
-+ <Class name="vtkProcessingUnitResource" wrappable="false"/>
-+ <Class name="vtkPolygonalSurfacePointPlacerNode" wrappable="false"/>
-+ <Class name="vtkRectf" wrappable="false"/>
-+ <Class name="vtkRenderState" wrappable="false"/>
-+ <Class name="vtkShader2" wrappable="false"/>
-+ <Class name="vtkShader2Collection" wrappable="false"/>
-+ <Class name="vtkShaderProgram2" wrappable="false"/>
-+ <Class name="vtkShadowMapBakerPassLightCameras" wrappable="false"/>
-+ <Class name="vtkShadowMapBakerPassTextures" wrappable="false"/>
-+ <Class name="vtkStdString" wrappable="false"/>
-+ <Class name="vtkTDxMotionEventInfo" wrappable="false"/>
-+ <Class name="vtkTextureUnitManager" wrappable="false"/>
-+ <Class name="vtkTIFFReaderInternal" wrappable="false"/>
-+ <Class name="vtkTimeStamp" wrappable="false"/>
-+ <Class name="vtkUnicodeString" wrappable="false"/>
-+ <Class name="vtkVariant" wrappable="false"/>
-+ <Class name="vtkVector2f" wrappable="false"/>
-+ <Class name="vtkVector2i" wrappable="false"/>
-+ <Class name="vtkVector3d" wrappable="false"/>
-+ <Class name="vtkVolumeRayCastDynamicInfo" wrappable="false"/>
-+ <Class name="vtkVolumeRayCastStaticInfo" wrappable="false"/>
-+ at AVDN_EXTRA_EXCLUDE_CLASSES_XML@
-+
-+ <!-- Class patterns to exclude from wrapped layers -->
-+
-+ <ClassPattern pattern=".+<.+>" wrappable="false"/>
-+ <ClassPattern pattern="vtk.*::" wrappable="false"/>
-+
-+
-+ <!-- Individual classes to include in wrapped layers -->
-+
-+ <!-- vtkCommand: shadow="true" -->
-+ <Class name="vtkCommand" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ shadow="true"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
-+ />
-+
-+ <!-- vtkImageData: extra hand-crafted code -->
-+ <Class name="vtkImageData" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ shadow="false"
-+ extraExportLayerCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkImageDataEL_Extra.cxx"
-+ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkImageData_Extra.cs"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
-+ />
-+
-+ <!-- vtkImplicitFunction: shadow="true" -->
-+ <Class name="vtkImplicitFunction" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ shadow="true"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
-+ />
-+
-+ <!-- vtkObject: extra hand-crafted code -->
-+ <Class name="vtkObject" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ shadow="false"
-+ extraExportLayerCode="@CMAKE_CURRENT_BINARY_DIR@/export-layer/vtkObjectEL_Extra.cxx"
-+ extraCsharpCode="@CMAKE_CURRENT_BINARY_DIR@/csharp/vtkObject_Extra.cs"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
-+ />
-+
-+ <!-- vtkProgrammableAttributeDataFilter: extra hand-crafted code -->
-+ <Class name="vtkProgrammableAttributeDataFilter" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ shadow="false"
-+ extraExportLayerCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkProgrammableAttributeDataFilterEL_Extra.cxx"
-+ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkProgrammableAttributeDataFilter_Extra.cs"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
-+ />
-+
-+ <!-- vtkStringArray: extra hand-crafted code -->
-+ <Class name="vtkStringArray" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ shadow="false"
-+ extraExportLayerCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkStringArrayEL_Extra.cxx"
-+ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkStringArray_Extra.cs"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
-+ />
-+
-+ <!-- Class patterns to include in wrapped layers -->
-+ <ClassPattern pattern="^vtk" wrappable="true"
-+ defaultFactoryMethod="New"
-+ defaultDisposalMethod="Delete"
-+ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/dllexportconf.cs"
-+ shadow="false"
-+ registerMethod="Register(null)"
-+ unRegisterMethod="UnRegister(null)"
-+ getRefCountMethod="GetReferenceCount()"
-+ registerBaseClass="vtkObjectBase"
-+ registerInclude="#include "vtkObjectBase.h""
-+ wrappedObjectBase="WrappedObject"
-+ beginExcludeRegex="^[\t ]*//BTX.*$"
-+ endExcludeRegex="^[\t ]*//ETX.*$"
-+ countedMethodsRegex="^(CreateImageReader2|CreateInstance|MakeTransform|New|NewInstance)$"
-+ emitDefaultFactoryMethod="true"
-+ externalHints="@VTK_WRAP_HINTS@"
-+ />
-+
-+</MummySettings>
-Index: gdcm-2.2.0/CMake/FindACTIVIZ.cmake
-===================================================================
---- gdcm-2.2.0.orig/CMake/FindACTIVIZ.cmake 2012-01-24 11:55:34.000000000 +0100
-+++ gdcm-2.2.0/CMake/FindACTIVIZ.cmake 2012-01-24 11:56:43.000000000 +0100
-@@ -15,14 +15,14 @@
-
- FIND_FILE(ACTIVIZ_KITWARE_VTK_LIBRARY
- NAMES Kitware.VTK.dll
-- PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil
-+ PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil /usr/lib/cli/ActiViz.NET
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware\\ActiVizDotNet 5.2.1]/bin"
- $ENV{ACTIVIZ_ROOT}/bin
- )
-
- FIND_FILE(ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY
- NAMES Kitware.mummy.Runtime.dll
-- PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil
-+ PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil /usr/lib/cli/Kitware.mummy.Runtime-1.0
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware\\ActiVizDotNet 5.2.1]/bin"
- $ENV{ACTIVIZ_ROOT}/bin
- )
Deleted: trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,174 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- gdcm (2.2.0-11) UNRELEASED; urgency=low
- .
- * Remove SONAME from python module, as per policy
- * Build PHP5 bindings
- * Fix issue with python 3.2 vs 2.7
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ gdcm-2.2.0/Utilities/VTK/vtkGDCMImageReader_Extra.cs
-@@ -0,0 +1,28 @@
-+/*=========================================================================
-+
-+ Program: GDCM (Grassroots DICOM). A DICOM library
-+
-+ Copyright (c) 2006-2011 Mathieu Malaterre
-+ All rights reserved.
-+ See Copyright.txt or http://gdcm.sourceforge.net/Copyright.html for details.
-+
-+ This software is distributed WITHOUT ANY WARRANTY; without even
-+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-+ PURPOSE. See the above copyright notice for more information.
-+
-+=========================================================================*/
-+
-+namespace Kitware.VTK.GDCM
-+{
-+public class vtkgdcm {
-+// FIXME why isn't mummy doing it ?
-+ public static readonly int VTK_LUMINANCE = 1;
-+ public static readonly int VTK_LUMINANCE_ALPHA = 2;
-+ public static readonly int VTK_RGB = 3;
-+ public static readonly int VTK_RGBA = 4;
-+ public static readonly int VTK_INVERSE_LUMINANCE = 5;
-+ public static readonly int VTK_LOOKUP_TABLE = 6;
-+ public static readonly int VTK_YBR = 7;
-+ public static readonly int VTK_CMYK = 8;
-+}
-+}
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
-@@ -12,11 +12,11 @@ SET(vtkgdcm_SRCS
- vtkGDCMMedicalImageProperties.cxx
- )
-
--IF(GDCM_HAVE_PTHREAD_H)
-+IF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
- SET(vtkgdcm_SRCS ${vtkgdcm_SRCS}
- vtkGDCMThreadedImageReader.cxx
- )
--ENDIF(GDCM_HAVE_PTHREAD_H)
-+ENDIF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
-
- INCLUDE(${VTK_USE_FILE})
-
-@@ -183,11 +183,13 @@ IF(GDCM_WRAP_PHP)
-
- SWIG_ADD_MODULE(php_vtkgdcm php vtkgdcm.i)
- SWIG_LINK_LIBRARIES(php_vtkgdcm vtkgdcm)
-+ TARGET_LINK_LIBRARIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} ${vtkgdcm_LIBS})
- IF(UNIX)
-- SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES OUTPUT_NAME "vtkgdcm")
-+ SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES OUTPUT_NAME "vtkgdcm")
- ENDIF(UNIX)
- SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES PREFIX "")
- SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
-+ set_property(TARGET ${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTY NO_SONAME 1)
-
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
- INSTALL(TARGETS ${SWIG_MODULE_php_vtkgdcm_REAL_NAME}
-@@ -203,11 +205,13 @@ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
- # endif(NAMELINK_ONLY)
-
- # See gdcm bug #3175803
-+if(${SWIG_VERSION} LESS 2.0.2)
- add_custom_command(TARGET ${SWIG_MODULE_php_vtkgdcm_REAL_NAME}
- PRE_BUILD
- COMMAND sed -i -e 's/zend_error_noreturn/zend_error/g' "${swig_generated_file_fullname}"
- COMMENT "Patching zend_error_noreturn into zend_error"
- )
-+endif()
-
- # Let's copy vtkgdcm.php into the bin dir:
- ADD_CUSTOM_COMMAND(
-@@ -220,6 +224,9 @@ ADD_CUSTOM_TARGET(VTKGDCMPHP ALL
- DEPENDS ${LIBRARY_OUTPUT_PATH}/vtkgdcm.php
- COMMENT "building vtkgdcm.php"
- )
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/vtkgdcm.php
-+ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKPythonModule
-+ )
-
- ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
- ENDIF(GDCM_WRAP_PHP)
-@@ -266,6 +273,7 @@ IF(GDCM_WRAP_CSHARP)
-
- IF(GDCM_USE_ACTIVIZ)
- FIND_PACKAGE(Mummy REQUIRED)
-+ MARK_AS_ADVANCED(Mummy_DIR)
- IF(NOT Mummy_BASE_DIR)
- MESSAGE(FATAL_ERROR "error: Mummy_BASE_DIR not defined. Please set Mummy_DIR to the directory containing MummyConfig.cmake")
- ENDIF(NOT Mummy_BASE_DIR)
-@@ -273,6 +281,7 @@ IF(GDCM_WRAP_CSHARP)
- IF(NOT mummy_EXECUTABLE)
- FIND_PROGRAM(mummy_EXECUTABLE mummy)
- ENDIF(NOT mummy_EXECUTABLE)
-+ MARK_AS_ADVANCED(mummy_EXECUTABLE)
- IF(NOT mummy_EXECUTABLE)
- MESSAGE(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
- ENDIF(NOT mummy_EXECUTABLE)
-@@ -280,6 +289,7 @@ IF(GDCM_WRAP_CSHARP)
- IF(NOT gccxml_EXECUTABLE)
- FIND_PROGRAM(gccxml_EXECUTABLE gccxml)
- ENDIF(NOT gccxml_EXECUTABLE)
-+ MARK_AS_ADVANCED(gccxml_EXECUTABLE)
- IF(NOT gccxml_EXECUTABLE)
- MESSAGE(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
- ENDIF(NOT gccxml_EXECUTABLE)
-@@ -471,6 +481,7 @@ IF(GDCM_WRAP_CSHARP)
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtk${kit})
- TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtkCommon)
-+ set_property(TARGET Kitware.VTK.vtk${kit}.Unmanaged PROPERTY NO_SONAME 1)
- # TODO -- rename this CopyLibraries here too...
- ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged Kitware.mummy.CopyLibraries2)
- ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged "vtk${kit}GenerateWrappers")
-@@ -506,6 +517,7 @@ IF(GDCM_WRAP_CSHARP)
- SET(ALLKITS_CS_SOURCES
- ${ALLKITS_CS_SOURCES}
- "${CMAKE_CURRENT_BINARY_DIR}/csharp/AssemblyInfo.cs"
-+ ${CMAKE_CURRENT_SOURCE_DIR}/vtkGDCMImageReader_Extra.cs
- )
-
- SET(AVDN_VTK_CSC_REFS ${ACTIVIZ_KITWARE_VTK_LIBRARY} ${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY})
-@@ -689,9 +701,9 @@ IF(GDCM_WRAP_PYTHON)
- # do not set the version on the Python module:
- #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- ADD_LIBRARY(${VTKGDCM_NAME}Python MODULE ${VTKGDCM_NAME}PythonInit.cxx)
-- # do not set the version on the PythonD module:
-+ # do not set the version on the Python module:
- SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME})
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARY})
- FOREACH(c ${vtkgdcm_LIBS} vtkFiltering)
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
- ENDFOREACH(c)
-@@ -699,6 +711,8 @@ IF(GDCM_WRAP_PYTHON)
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD vtkPythonCore)
- endif()
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Python ${VTKGDCM_NAME}PythonD)
-+ set_property(TARGET ${VTKGDCM_NAME}Python PROPERTY NO_SONAME 1)
-+ #set_property(TARGET ${VTKGDCM_NAME}PythonD PROPERTY NO_SONAME 1)
- # Python extension modules on Windows must have the extension ".pyd"
- # instead of ".dll" as of Python 2.5. Older python versions do support
- # this suffix.
Deleted: trunk/packages/gdcm/trunk/debian/patches/doxygen_svg.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/doxygen_svg.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/doxygen_svg.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,22 +0,0 @@
-Index: gdcm-2.0.19/Utilities/doxygen/doxyfile.in
-===================================================================
---- gdcm-2.0.19.orig/Utilities/doxygen/doxyfile.in 2012-01-04 14:48:33.000000000 +0100
-+++ gdcm-2.0.19/Utilities/doxygen/doxyfile.in 2012-01-04 14:48:44.000000000 +0100
-@@ -637,7 +637,7 @@
- # for example use the pattern */test/*
-
- EXCLUDE_PATTERNS = */.svn/* \
-- */.git/*
-+ */.git/* \
- */VTK4/*
-
- # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-@@ -1592,7 +1592,7 @@
- # generated by dot. Possible values are png, jpg, or gif
- # If left blank png will be used.
-
--DOT_IMAGE_FORMAT = png
-+DOT_IMAGE_FORMAT = svg
-
- # The tag DOT_PATH can be used to specify the path where the dot tool can be
- # found. If left blank, it is assumed the dot tool can be found in the path.
Deleted: trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,93 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- gdcm (2.2.0-11) UNRELEASED; urgency=low
- .
- * Remove SONAME from python module, as per policy
- * Build PHP5 bindings
- * Fix issue with python 3.2 vs 2.7
- * Adding a gdcm-doc package
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Utilities/doxygen/CMakeLists.txt 2011-12-30 15:37:28.000000000 +0000
-+++ gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt 2012-05-14 08:13:32.390320263 +0000
-@@ -143,6 +143,10 @@
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf
- COMMENT "GDCM: Executing GDCMDoxygenPDF"
- )
-+ INSTALL(FILES
-+ ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf
-+ DESTINATION ${GDCM_INSTALL_DOC_DIR}
-+ )
- ELSE(UNIX AND GDCM_PDF_DOCUMENTATION)
- # make DoxygenDoc depends on the final tarball thus all file are garantee to be generated
- ADD_CUSTOM_TARGET(GDCMDoxygenDoc
-@@ -186,6 +190,10 @@
- ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmviewer.1
- DESTINATION ${GDCM_INSTALL_MAN_DIR}/man1 COMPONENT Development
- )
-+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${GDCM_INSTALL_DOC_DIR}
-+ PATTERN "*.md5" EXCLUDE
-+ PATTERN "*.dot" EXCLUDE
-+ )
-
- # http://lists.debian.org/debian-italian/2006/12/msg00878.html
- # man2txt : man man | col -b | less
-Index: gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Utilities/doxygen/vtk/CMakeLists.txt 2011-12-30 15:37:28.000000000 +0000
-+++ gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt 2012-05-14 08:13:08.706321120 +0000
-@@ -22,7 +22,7 @@
- SET (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
- ENDIF (INCLUDE_QT_DOCUMENTATION)
- SET(BUILD_DOXYGEN ON)
-- SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE ON)
-+ SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE OFF)
- SET(DOCUMENTATION_HTML_TARZ ON)
- SET(DOXYGEN_PROJECT_NAME "vtkgdcm")
- if(VTK_SOURCE_DIR)
-@@ -103,7 +103,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
-
- ADD_CUSTOM_TARGET(${DOXYGEN_PROJECT_NAME}DoxygenDoc
-- #ALL
-+ ALL
- ${BASH}
- ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
-
-Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-05-13 16:07:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-05-14 08:12:57.402321528 +0000
-@@ -699,10 +699,10 @@
- ADD_LIBRARY(${VTKGDCM_NAME}PythonD ${vtkgdcmPYTHON_SRCS})
- # this is a library set the version:
- # do not set the version on the Python module:
-- #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-+ SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- ADD_LIBRARY(${VTKGDCM_NAME}Python MODULE ${VTKGDCM_NAME}PythonInit.cxx)
- # do not set the version on the Python module:
-- SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-+ #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARY})
- FOREACH(c ${vtkgdcm_LIBS} vtkFiltering)
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
Deleted: trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,25 +0,0 @@
-From 5263b20bb4ea628f850c8f3b0d5c1d8a5f2163a2 Mon Sep 17 00:00:00 2001
-From: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Date: Tue, 3 Jan 2012 17:09:13 +0100
-Subject: [PATCH] Need to explicitely state we need 1.5 for generic
-
----
- CMake/FindJavaProperties.cmake | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/CMake/FindJavaProperties.cmake b/CMake/FindJavaProperties.cmake
-index cfc48a8..14e9c62 100644
---- a/CMake/FindJavaProperties.cmake
-+++ b/CMake/FindJavaProperties.cmake
-@@ -57,7 +57,7 @@ if(${current_list_path}/GetSystemProperty.java IS_NEWER_THAN ${CMAKE_BINARY_DIR}
- #message("${current_list_path}/GetSystemProperty.java")
- #message("${CMAKE_CURRENT_BINARY_DIR}/GetSystemProperty.class")
- execute_process(
-- COMMAND ${Java_JAVAC_EXECUTABLE}
-+ COMMAND ${Java_JAVAC_EXECUTABLE} -source 1.5
- ${current_list_path}/GetSystemProperty.java -d ${CMAKE_BINARY_DIR}
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
---
-1.7.4.1
-
Deleted: trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/fixgcj2.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,24 +0,0 @@
-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/fixhurd.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,9 +1,12 @@
-According to explanation from:
-http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_
-Index: gdcm-2.2.0/Source/Common/gdcmSystem.cxx
+Description: Fix compilation on GNU/Hurd
+ According to explanation from:
+ http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: gdcm-2.2.1/Source/Common/gdcmSystem.cxx
===================================================================
---- gdcm-2.2.0.orig/Source/Common/gdcmSystem.cxx 2012-03-21 21:54:04.000000000 +0100
-+++ gdcm-2.2.0/Source/Common/gdcmSystem.cxx 2012-03-21 21:54:20.000000000 +0100
+--- gdcm-2.2.1.orig/Source/Common/gdcmSystem.cxx 2012-09-20 10:48:46.600116872 +0200
++++ gdcm-2.2.1/Source/Common/gdcmSystem.cxx 2012-09-20 10:48:51.756116686 +0200
@@ -363,6 +363,10 @@
return Rmdir(source) == 0;
}
@@ -15,11 +18,11 @@
// return size of file; also returns zero if no file exists
size_t System::FileSize(const char* filename)
{
-Index: gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx
+Index: gdcm-2.2.1/Source/DataDictionary/gdcmGlobal.cxx
===================================================================
---- gdcm-2.2.0.orig/Source/DataDictionary/gdcmGlobal.cxx 2012-03-21 21:54:04.000000000 +0100
-+++ gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx 2012-03-21 21:54:20.000000000 +0100
-@@ -131,6 +131,10 @@
+--- gdcm-2.2.1.orig/Source/DataDictionary/gdcmGlobal.cxx 2012-09-20 10:48:46.616116871 +0200
++++ gdcm-2.2.1/Source/DataDictionary/gdcmGlobal.cxx 2012-09-20 10:48:51.756116686 +0200
+@@ -133,6 +133,10 @@
return true;
}
@@ -30,10 +33,10 @@
const char *Global::Locate(const char *resfile) const
{
#ifdef _WIN32
-Index: gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h
+Index: gdcm-2.2.1/Utilities/socketxx/socket++/sockstream.h
===================================================================
---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/sockstream.h 2012-03-21 21:54:19.000000000 +0100
-+++ gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h 2012-03-21 21:54:20.000000000 +0100
+--- gdcm-2.2.1.orig/Utilities/socketxx/socket++/sockstream.h 2012-09-20 10:48:46.636116871 +0200
++++ gdcm-2.2.1/Utilities/socketxx/socket++/sockstream.h 2012-09-20 10:48:51.756116686 +0200
@@ -165,7 +165,7 @@
msg_peek = MSG_PEEK,
msg_dontroute = MSG_DONTROUTE
@@ -43,10 +46,10 @@
,msg_maxiovlen = MSG_MAXIOVLEN
#endif
};
-Index: gdcm-2.2.0/Utilities/socketxx/socket++/local.h
+Index: gdcm-2.2.1/Utilities/socketxx/socket++/local.h
===================================================================
---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/local.h 2012-03-21 21:54:19.000000000 +0100
-+++ gdcm-2.2.0/Utilities/socketxx/socket++/local.h 2012-03-21 21:54:20.000000000 +0100
+--- gdcm-2.2.1.orig/Utilities/socketxx/socket++/local.h 2012-09-20 10:48:46.652116870 +0200
++++ gdcm-2.2.1/Utilities/socketxx/socket++/local.h 2012-09-20 10:48:51.756116686 +0200
@@ -97,7 +97,7 @@
// extern "C" int gethostname (char* hostname, size_t len);
// the above breaks on some old MacOSX system where prototype is:
@@ -56,10 +59,10 @@
extern char* SYS_SIGLIST [];
#endif
#endif
-Index: gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx
+Index: gdcm-2.2.1/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx
===================================================================
---- gdcm-2.2.0.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-03-21 21:54:51.000000000 +0100
-+++ gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-03-21 21:54:55.000000000 +0100
+--- gdcm-2.2.1.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-09-20 10:48:46.980116858 +0200
++++ gdcm-2.2.1/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-09-20 10:48:51.756116686 +0200
@@ -35,9 +35,7 @@
#include <arpa/inet.h>
#endif
Deleted: trunk/packages/gdcm/trunk/debian/patches/fixundef.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixundef.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/fixundef.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,50 +0,0 @@
-Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-04-11 12:52:48.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-04-11 14:02:25.000000000 +0000
-@@ -12,11 +12,11 @@
- vtkGDCMMedicalImageProperties.cxx
- )
-
--IF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
-+IF(GDCM_HAVE_PTHREAD_H)
- SET(vtkgdcm_SRCS ${vtkgdcm_SRCS}
- vtkGDCMThreadedImageReader.cxx
- )
--ENDIF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
-+ENDIF(GDCM_HAVE_PTHREAD_H)
-
- INCLUDE(${VTK_USE_FILE})
-
-@@ -127,6 +127,9 @@
-
- SET_TARGET_PROPERTIES(${VTKGDCM_NAME} PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
-+IF(GDCM_HAVE_PTHREAD_H)
-+TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} pthread)
-+ENDIF(GDCM_HAVE_PTHREAD_H)
- # prevent viral dep of vtkgdcm
- SET_PROPERTY(TARGET ${VTKGDCM_NAME} PROPERTY LINK_INTERFACE_LIBRARIES "")
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-@@ -467,6 +470,7 @@
- TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged ${Mummy_RUNTIME_LINK_LIBRARIES})
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtk${kit})
-+ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtkCommon)
- # TODO -- rename this CopyLibraries here too...
- ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged Kitware.mummy.CopyLibraries2)
- ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged "vtk${kit}GenerateWrappers")
-@@ -688,9 +692,12 @@
- # do not set the version on the PythonD module:
- SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME})
-- FOREACH(c ${vtkgdcm_LIBS})
-+ FOREACH(c ${vtkgdcm_LIBS} vtkFiltering)
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
- ENDFOREACH(c)
-+ if(TARGET vtkPythonCore)
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD vtkPythonCore)
-+ endif()
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Python ${VTKGDCM_NAME}PythonD)
- # Python extension modules on Windows must have the extension ".pyd"
- # instead of ".dll" as of Python 2.5. Older python versions do support
Deleted: trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,44 +0,0 @@
-Index: gdcm-2.2.0/Utilities/socketxx/socket++/local.h
-===================================================================
---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/local.h 2012-02-01 14:51:59.000000000 +0100
-+++ gdcm-2.2.0/Utilities/socketxx/socket++/local.h 2012-02-01 14:52:04.000000000 +0100
-@@ -97,7 +97,7 @@
- // extern "C" int gethostname (char* hostname, size_t len);
- // the above breaks on some old MacOSX system where prototype is:
- // extern "C" int gethostname (char* hostname, int len);
--#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
-+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
- extern char* SYS_SIGLIST [];
- #endif
- #endif
-Index: gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx
-===================================================================
---- gdcm-2.2.0.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-02-01 14:51:59.000000000 +0100
-+++ gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-02-01 14:52:04.000000000 +0100
-@@ -28,6 +28,13 @@
- #include "gdcmULConnectionInfo.h"
- #include <socket++/sockinet.h>//for setting up the local socket
-
-+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) // inet_addr
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#endif
-+
- #if defined (__APPLE__)
- #include <arpa/inet.h> // inet_addr
- #endif
-Index: gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h
-===================================================================
---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/sockstream.h 2012-02-01 14:51:59.000000000 +0100
-+++ gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h 2012-02-02 08:50:13.000000000 +0100
-@@ -165,7 +165,7 @@
- msg_peek = MSG_PEEK,
- msg_dontroute = MSG_DONTROUTE
-
--#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
-+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
- ,msg_maxiovlen = MSG_MAXIOVLEN
- #endif
- };
Modified: trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,9 +1,20 @@
Description: link to vtk doc
Author: Mathieu Malaterre <malat at debian.org>
---- gdcm-2.2.0.orig/Utilities/doxygen/vtk/CMakeLists.txt
-+++ gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt
-@@ -89,7 +89,7 @@ MARK_AS_ADVANCED(VTK_DIR)
+Index: gdcm-2.2.1/Utilities/doxygen/vtk/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.1.orig/Utilities/doxygen/vtk/CMakeLists.txt 2012-09-20 09:03:16.688085464 +0000
++++ gdcm-2.2.1/Utilities/doxygen/vtk/CMakeLists.txt 2012-09-20 09:03:51.152084220 +0000
+@@ -22,7 +22,7 @@
+ SET (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
+ ENDIF (INCLUDE_QT_DOCUMENTATION)
+ SET(BUILD_DOXYGEN ON)
+- SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE ON)
++ SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE OFF)
+ SET(DOCUMENTATION_HTML_TARZ ON)
+ SET(DOXYGEN_PROJECT_NAME "vtkgdcm")
+ if(VTK_SOURCE_DIR)
+@@ -89,7 +89,7 @@
GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH)
ENDIF(NOT DOT_PATH)
@@ -12,9 +23,20 @@
IF(INCLUDE_QT_DOCUMENTATION)
SET (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
ENDIF(INCLUDE_QT_DOCUMENTATION)
---- gdcm-2.2.0.orig/Utilities/doxygen/vtk/doxyfile.in
-+++ gdcm-2.2.0/Utilities/doxygen/vtk/doxyfile.in
-@@ -23,6 +23,7 @@ PDF_HYPERLINKS = YES
+@@ -103,7 +103,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
+
+ ADD_CUSTOM_TARGET(${DOXYGEN_PROJECT_NAME}DoxygenDoc
+- #ALL
++ ALL
+ ${BASH}
+ ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
+
+Index: gdcm-2.2.1/Utilities/doxygen/vtk/doxyfile.in
+===================================================================
+--- gdcm-2.2.1.orig/Utilities/doxygen/vtk/doxyfile.in 2012-09-20 09:03:16.688085464 +0000
++++ gdcm-2.2.1/Utilities/doxygen/vtk/doxyfile.in 2012-09-20 09:03:51.152084220 +0000
+@@ -23,6 +23,7 @@
HAVE_DOT = YES
#HAVE_DOT = NO
DOT_PATH = "@DOT_PATH@"
@@ -22,3 +44,16 @@
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES
+Index: gdcm-2.2.1/Utilities/doxygen/doxyfile.in
+===================================================================
+--- gdcm-2.2.1.orig/Utilities/doxygen/doxyfile.in 2012-09-20 09:03:16.760085461 +0000
++++ gdcm-2.2.1/Utilities/doxygen/doxyfile.in 2012-09-20 09:03:51.152084220 +0000
+@@ -1591,7 +1591,7 @@
+ # generated by dot. Possible values are png, jpg, or gif
+ # If left blank png will be used.
+
+-DOT_IMAGE_FORMAT = png
++DOT_IMAGE_FORMAT = svg
+
+ # The tag DOT_PATH can be used to specify the path where the dot tool can be
+ # found. If left blank, it is assumed the dot tool can be found in the path.
Deleted: trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,21 +0,0 @@
-This is a bad idea to remove doc from ALL as man page need doxygen step
-to be generated.
-Index: gdcm-2.0.18/Utilities/doxygen/CMakeLists.txt
-===================================================================
---- gdcm-2.0.18.orig/Utilities/doxygen/CMakeLists.txt 2011-09-06 15:47:50.000000000 +0200
-+++ gdcm-2.0.18/Utilities/doxygen/CMakeLists.txt 2011-09-06 15:48:05.000000000 +0200
-@@ -139,14 +139,12 @@
- )
- # add target to 'ALL'
- ADD_CUSTOM_TARGET(GDCMDoxygenPDF
-- ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf
- COMMENT "GDCM: Executing GDCMDoxygenPDF"
- )
- ELSE(UNIX AND GDCM_PDF_DOCUMENTATION)
- # make DoxygenDoc depends on the final tarball thus all file are garantee to be generated
- ADD_CUSTOM_TARGET(GDCMDoxygenDoc
-- ALL
- DEPENDS ${GDCM_DOC_TARBALL}
- COMMENT "GDCM: Executing GDCMDoxygenDoc"
- )
Deleted: trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,13 +0,0 @@
-Index: gdcm-2.2.0/Wrapping/Python/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Wrapping/Python/CMakeLists.txt 2012-02-01 14:51:58.000000000 +0100
-+++ gdcm-2.2.0/Wrapping/Python/CMakeLists.txt 2012-02-01 14:52:09.000000000 +0100
-@@ -83,7 +83,7 @@
- # the other gdcm lib. bad !!!
- #SET (SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS ${SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/docstrings.i)
- SWIG_ADD_MODULE(${GDCM_PYTHON_IMPLEMENTATION_NAME} python gdcmswig.i gdcmPythonFilter.cxx)
--SWIG_LINK_LIBRARIES(${GDCM_PYTHON_IMPLEMENTATION_NAME} gdcmMEXD gdcmMSFF gdcmIOD ${PYTHON_LIBRARIES})
-+SWIG_LINK_LIBRARIES(${GDCM_PYTHON_IMPLEMENTATION_NAME} gdcmMEXD gdcmMSFF gdcmIOD) # ${PYTHON_LIBRARIES})
-
- #MESSAGE(SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS)
- #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gdcm.pth.in
Deleted: trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,22 +0,0 @@
-From 6de3cc940b3358f493f2022774a28ebe6f454a84 Mon Sep 17 00:00:00 2001
-From: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Date: Mon, 7 May 2012 11:29:34 +0200
-Subject: [PATCH] Start using the next cmake 2.8.9 property: NO_SONAME
-
-This property will allow the building of proper module, without SONAME
----
- Wrapping/Python/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: gdcm-2.2.0/Wrapping/Python/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Wrapping/Python/CMakeLists.txt 2012-05-07 11:33:30.239979003 +0200
-+++ gdcm-2.2.0/Wrapping/Python/CMakeLists.txt 2012-05-07 11:33:40.719978624 +0200
-@@ -84,6 +84,7 @@
- #SET (SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS ${SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/docstrings.i)
- SWIG_ADD_MODULE(${GDCM_PYTHON_IMPLEMENTATION_NAME} python gdcmswig.i gdcmPythonFilter.cxx)
- SWIG_LINK_LIBRARIES(${GDCM_PYTHON_IMPLEMENTATION_NAME} gdcmMEXD gdcmMSFF gdcmIOD) # ${PYTHON_LIBRARIES})
-+set_property(TARGET ${SWIG_MODULE_${GDCM_PYTHON_IMPLEMENTATION_NAME}_REAL_NAME} PROPERTY NO_SONAME 1)
-
- #MESSAGE(SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS)
- #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gdcm.pth.in
Deleted: trunk/packages/gdcm/trunk/debian/patches/removetransitivepython.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removetransitivepython.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/removetransitivepython.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,13 +0,0 @@
-Description: remove linking to libpythonX.Y.so from python module
-Author: Mathieu Malaterre <malat at debian.org>
-
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
-@@ -711,6 +711,7 @@ IF(GDCM_WRAP_PYTHON)
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD vtkPythonCore)
- endif()
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Python ${VTKGDCM_NAME}PythonD)
-+SET_PROPERTY(TARGET ${VTKGDCM_NAME}PythonD PROPERTY LINK_INTERFACE_LIBRARIES "")
- set_property(TARGET ${VTKGDCM_NAME}Python PROPERTY NO_SONAME 1)
- #set_property(TARGET ${VTKGDCM_NAME}PythonD PROPERTY NO_SONAME 1)
- # Python extension modules on Windows must have the extension ".pyd"
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,17 +1,3 @@
toplevelskip.patch
-#removedocfromall.patch
-fixgcj.patch
-fixgcj2.patch
-doxygen_svg.patch
-stableapi.patch
-activiz.net.patch
-kfreebsdfix.patch
-removepythonlink.patch
fixhurd.patch
-fixundef.patch
-removesonamepython.patch
-sonameprops.patch
-csharpfixes.patch
-fixdoxygeninstall.patch
linkvtkdoc.patch
-removetransitivepython.patch
Deleted: trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,55 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- gdcm (2.2.0-11) UNRELEASED; urgency=low
- .
- * Remove SONAME from python module, as per policy
- * Build PHP5 bindings
- * Fix issue with python 3.2 vs 2.7
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- gdcm-2.2.0.orig/Wrapping/PHP/CMakeLists.txt
-+++ gdcm-2.2.0/Wrapping/PHP/CMakeLists.txt
-@@ -28,6 +28,7 @@ SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPE
- # swig expect a name like that: php_gdcm.so
- SWIG_ADD_MODULE(php_gdcm php gdcm.i)
- SWIG_LINK_LIBRARIES(php_gdcm gdcmMSFF)
-+set_property(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME} PROPERTY NO_SONAME 1)
-
- SET_TARGET_PROPERTIES(${SWIG_MODULE_php_gdcm_REAL_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
- # Remove 'lib' prefix :no-op on windows and valid for UNIX based syste
-@@ -51,11 +52,13 @@ ENDIF(UNIX)
- # See gdcm bug #3175803
- # This is fixed in SWIG 2.0.2:
- # http://sourceforge.net/tracker/?func=detail&atid=101645&aid=3166423&group_id=1645
--add_custom_command(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME}
-- PRE_BUILD
-- COMMAND sed -i -e 's/zend_error_noreturn/zend_error/g' "${swig_generated_file_fullname}"
-- COMMENT "Patching zend_error_noreturn into zend_error"
-+if(${SWIG_VERSION} LESS 2.0.2)
-+ add_custom_command(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME}
-+ PRE_BUILD
-+ COMMAND sed -i -e 's/zend_error_noreturn/zend_error/g' "${swig_generated_file_fullname}"
-+ COMMENT "Patching zend_error_noreturn into zend_error"
- )
-+endif()
-
- # Let's copy gdcm.php into the bin dir:
- ADD_CUSTOM_COMMAND(
Deleted: trunk/packages/gdcm/trunk/debian/patches/stableapi.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/stableapi.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/stableapi.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,62 +0,0 @@
-Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-01-23 11:24:31.000000000 +0100
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-01-23 11:24:33.000000000 +0100
-@@ -287,6 +287,10 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
- @ONLY)
-+ CONFIGURE_FILE(
-+ ${GDCM_SOURCE_DIR}/Wrapping/Csharp/key.snk
-+ ${CMAKE_CURRENT_BINARY_DIR}/key.snk
-+ COPYONLY)
- IF(GDCM_USE_ACTIVIZ)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-Index: gdcm-2.2.0/Wrapping/Csharp/AssemblyInfo.cs.in
-===================================================================
---- gdcm-2.2.0.orig/Wrapping/Csharp/AssemblyInfo.cs.in 2012-01-23 11:24:31.000000000 +0100
-+++ gdcm-2.2.0/Wrapping/Csharp/AssemblyInfo.cs.in 2012-01-23 11:24:33.000000000 +0100
-@@ -68,9 +68,9 @@
- // The following attributes specify the key for the sign of your assembly. See the
- // .NET Framework documentation for more information about signing.
- // This is not required, if you don't want signing let these attributes like they're.
--[assembly: AssemblyDelaySign(false)]
-+//[assembly: AssemblyDelaySign(false)]
- // http://msdn.microsoft.com/en-us/library/6f05ezxy(VS.80).aspx
--//[assembly: AssemblyKeyFile("key.snk")]
--[assembly: AssemblyKeyFile("")]
-+[assembly: AssemblyKeyFile("key.snk")]
-+//[assembly: AssemblyKeyFile("")]
- //[assembly: AssemblyKeyName("GDCM Key")]
--[assembly: AssemblyKeyName("")]
-+//[assembly: AssemblyKeyName("")]
-Index: gdcm-2.2.0/Utilities/VTK/AssemblyInfo.cs.in
-===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/AssemblyInfo.cs.in 2012-01-23 11:24:31.000000000 +0100
-+++ gdcm-2.2.0/Utilities/VTK/AssemblyInfo.cs.in 2012-01-23 11:24:33.000000000 +0100
-@@ -68,6 +68,6 @@
- // The following attributes specify the key for the sign of your assembly. See the
- // .NET Framework documentation for more information about signing.
- // This is not required, if you don't want signing let these attributes like they're.
--[assembly: AssemblyDelaySign(false)]
--[assembly: AssemblyKeyFile("")]
--[assembly: AssemblyKeyName("")]
-+//[assembly: AssemblyDelaySign(false)]
-+[assembly: AssemblyKeyFile("key.snk")]
-+//[assembly: AssemblyKeyName("")]
-Index: gdcm-2.2.0/Wrapping/Csharp/CMakeLists.txt
-===================================================================
---- gdcm-2.2.0.orig/Wrapping/Csharp/CMakeLists.txt 2012-01-23 11:24:40.000000000 +0100
-+++ gdcm-2.2.0/Wrapping/Csharp/CMakeLists.txt 2012-01-23 11:24:46.000000000 +0100
-@@ -135,6 +135,10 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
- @ONLY)
-+ CONFIGURE_FILE(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/key.snk
-+ ${CMAKE_CURRENT_BINARY_DIR}/key.snk
-+ COPYONLY)
-
- # From Mirco Bauer on debian-cli
- # Hm? You wrote the C# binding for gdcm? Using C# in the lib name is
Modified: trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch 2012-09-20 12:32:38 UTC (rev 12241)
@@ -1,3 +1,8 @@
+Description: fix in source builds
+ buildd machine wants insource build. upstream does not allow
+ insource build since it break cpack source packaging
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: gdcm-2.0.18/CMakeLists.txt
===================================================================
--- gdcm-2.0.18.orig/CMakeLists.txt 2011-09-06 15:26:11.000000000 +0200
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2012-09-20 08:22:00 UTC (rev 12240)
+++ trunk/packages/gdcm/trunk/debian/rules 2012-09-20 12:32:38 UTC (rev 12241)
@@ -128,4 +128,4 @@
sed -e"s/@PYVER@/$(PYVER)/g" -e "s/@DEB_MONO_ARCHS@/$(DEB_MONO_ARCHS)/g" $< > $@
get-orig-source:
- uscan --verbose --force-download
+ uscan --verbose --force-download --rename
More information about the debian-med-commit
mailing list