Author: gert-guest Date: 2015-10-16 12:54:15 +0000 (Fri, 16 Oct 2015) New Revision: 20240
Modified: trunk/packages/gdcm/prepare-2.6/debian/changelog trunk/packages/gdcm/prepare-2.6/debian/control trunk/packages/gdcm/prepare-2.6/debian/control.in trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.install trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.installcligac trunk/packages/gdcm/prepare-2.6/debian/patches/castxml.patch trunk/packages/gdcm/prepare-2.6/debian/patches/fixhurd.patch trunk/packages/gdcm/prepare-2.6/debian/patches/series trunk/packages/gdcm/prepare-2.6/debian/patches/toplevelskip.patch trunk/packages/gdcm/prepare-2.6/debian/rules Log: Start preparing the new upstream * switch to vtk6 * drop java support because libvtk6-java doesn't exist. Why: #773422 * currently C-sharp bindings don't work maybe switch to swig3.0? Modified: trunk/packages/gdcm/prepare-2.6/debian/changelog =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/changelog 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/changelog 2015-10-16 12:54:15 UTC (rev 20240) @@ -1,5 +1,13 @@ -gdcm (2.4.4-5) UNRELEASED; urgency=medium +gdcm (2.6.0-1) UNRELEASED; urgency=medium + [Gert Wollny] + * new upstream version + * Apply patch provided in #797673 by Mathieru (see below) + + [Mathieu Malaterre] + * Do not use activiz.net anymore + + [Andreas Tille] * Switched to Sébastien Jodogne's correct e-mail -- Andreas Tille <[email protected]> Fri, 07 Aug 2015 10:45:58 +0200 Modified: trunk/packages/gdcm/prepare-2.6/debian/control =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/control 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/control 2015-10-16 12:54:15 UTC (rev 20240) @@ -5,13 +5,11 @@ Uploaders: Andreas Tille <[email protected]>, Steve M. Robbins <[email protected]>, Sébastien Jodogne <[email protected]> -Build-Depends: debhelper (>= 9), python-all-dev, libvtk-java, pvrg-jpeg, +Build-Depends: debhelper (>= 9), python-all-dev, pvrg-jpeg, uuid-dev, libz-dev, libexpat-dev, doxygen, - swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper, + swig (>= 2.0.7), cmake (>= 2.8.9), libvtk6-dev, libcharls-dev, javahelper, libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev, - libpoppler-private-dev, libssl-dev, python-vtk, castxml, libsocket++-dev, libpapyrus3-dev, - libactiviz.net-cil [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], - mummy [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], + libpoppler-private-dev, libssl-dev, python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev, cli-common-dev (>= 0.8~) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x] Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz @@ -101,19 +99,6 @@ PHP5 bindings to the GDCM DICOM library. It allows developers to use GDCM from PHP5 environment. -Package: libgdcm-java -Section: java -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends} -Suggests: java-virtual-machine -Description: Grassroots DICOM Java bindings - Grassroots DiCoM is a C++ library for DICOM medical files. It is - automatically wrapped to python/C#/Java (using swig). It supports - RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. - . - Java bindings to the GDCM DICOM library. It allows developers to use - GDCM from Java environment. - Package: python-gdcm Section: python Architecture: any @@ -176,18 +161,6 @@ . VTK PHP bindings to the GDCM DICOM library. -Package: libvtkgdcm-java -Section: java -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm2.4 (= ${binary:Version}) -Suggests: libgdcm-java -Description: Grassroots DICOM VTK Java bindings - Grassroots DiCoM is a C++ library for DICOM medical files. It is - automatically wrapped to python/C#/Java (using swig). It supports - RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. - . - VTK Java bindings to the GDCM DICOM library. - Package: python-vtkgdcm Section: python Architecture: any Modified: trunk/packages/gdcm/prepare-2.6/debian/control.in =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/control.in 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/control.in 2015-10-16 12:54:15 UTC (rev 20240) @@ -5,13 +5,11 @@ Uploaders: Andreas Tille <[email protected]>, Steve M. Robbins <[email protected]>, Sébastien Jodogne <[email protected]> -Build-Depends: debhelper (>= 9), python-all-dev, libvtk-java, pvrg-jpeg, +Build-Depends: debhelper (>= 9), python-all-dev, pvrg-jpeg, uuid-dev, libz-dev, libexpat-dev, doxygen, - swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper, + swig (>= 2.0.7), cmake (>= 2.8.9), libvtk6-dev, libcharls-dev, javahelper, libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev, - libpoppler-private-dev, libssl-dev, python-vtk, castxml, libsocket++-dev, libpapyrus3-dev, - libactiviz.net-cil [@DEB_MONO_ARCHS@], - mummy [@DEB_MONO_ARCHS@], + libpoppler-private-dev, libssl-dev, python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev, cli-common-dev (>= 0.8~) [@DEB_MONO_ARCHS@], mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@] Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz @@ -101,19 +99,6 @@ PHP5 bindings to the GDCM DICOM library. It allows developers to use GDCM from PHP5 environment. -Package: libgdcm-java -Section: java -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends} -Suggests: java-virtual-machine -Description: Grassroots DICOM Java bindings - Grassroots DiCoM is a C++ library for DICOM medical files. It is - automatically wrapped to python/C#/Java (using swig). It supports - RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. - . - Java bindings to the GDCM DICOM library. It allows developers to use - GDCM from Java environment. - Package: python-gdcm Section: python Architecture: any @@ -176,18 +161,6 @@ . VTK PHP bindings to the GDCM DICOM library. -Package: libvtkgdcm-java -Section: java -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm2.4 (= ${binary:Version}) -Suggests: libgdcm-java -Description: Grassroots DICOM VTK Java bindings - Grassroots DiCoM is a C++ library for DICOM medical files. It is - automatically wrapped to python/C#/Java (using swig). It supports - RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. - . - VTK Java bindings to the GDCM DICOM library. - Package: python-vtkgdcm Section: python Architecture: any Modified: trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.install =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.install 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.install 2015-10-16 12:54:15 UTC (rev 20240) @@ -1,2 +1,2 @@ -usr/lib/*/Kitware.VTK.GDCM.dll usr/lib/cli/vtkgdcm-sharp-2.4 -usr/lib/*/libKitware.VTK.vtkgdcm.Unmanaged.so usr/lib/cli/vtkgdcm-sharp-2.4 +usr/lib/*/vtkgdcm-sharp.dll usr/lib/cli/vtkgdcm-sharp-2.4 +usr/lib/*/libvtkgdcmsharpglue.so usr/lib/cli/vtkgdcm-sharp-2.4 Modified: trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.installcligac =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.installcligac 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm-cil.installcligac 2015-10-16 12:54:15 UTC (rev 20240) @@ -1 +1 @@ -/usr/lib/cli/vtkgdcm-sharp-2.4/Kitware.VTK.GDCM.dll +/usr/lib/cli/vtkgdcm-sharp-2.4/vtkgdcm-sharp.dll Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/castxml.patch =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/castxml.patch 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/castxml.patch 2015-10-16 12:54:15 UTC (rev 20240) @@ -1,74 +0,0 @@ -Description: Replace gccxml with castxml -Author: Sebastien Jodogne <[email protected]>, Steve Robbins <[email protected]> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: gdcm-2.4.4/Utilities/VTK/CMakeLists.txt -=================================================================== ---- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt -+++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt -@@ -317,24 +317,16 @@ if(GDCM_WRAP_CSHARP) - message(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'") - endif() - -- if(NOT gccxml_EXECUTABLE) -- find_program(gccxml_EXECUTABLE gccxml) -+ if(NOT castxml_EXECUTABLE) -+ find_program(castxml_EXECUTABLE castxml) - endif() -- mark_as_advanced(gccxml_EXECUTABLE) -- if(NOT gccxml_EXECUTABLE) -- message(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'") -+ mark_as_advanced(castxml_EXECUTABLE) -+ if(NOT castxml_EXECUTABLE) -+ message(FATAL_ERROR "error: castxml not found. castxml_EXECUTABLE='${castxml_EXECUTABLE}'") - endif() -- set(gccxml_compiler "${CMAKE_CXX_COMPILER}") -- if(MSVC80) -- set(gccxml_compiler "msvc8") -- endif() -- if(MSVC90) -- set(gccxml_compiler "msvc9") -- endif() -- #message(STATUS "gccxml_compiler='${gccxml_compiler}'...") -- set(gccxml_include_args "") -+ set(castxml_include_args "") - foreach(dir ${Mummy_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}) -- set(gccxml_include_args ${gccxml_include_args} "-I${dir}") -+ set(castxml_include_args ${castxml_include_args} "-I${dir}") - endforeach() - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/MummySettings.xml.in" -@@ -409,17 +401,28 @@ if(GDCM_WRAP_CSHARP) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml -- COMMAND ${gccxml_EXECUTABLE} -+ COMMAND ${castxml_EXECUTABLE} - ARGS -- -fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml -- -fxml-start=_cable_ -- ${gccxml_include_args} -DCABLE_CONFIGURATION -- --gccxml-compiler ${gccxml_compiler} -+ --castxml-gccxml -+ -o ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml -+ --castxml-start _cable_ -+ ${castxml_include_args} -DCABLE_CONFIGURATION - ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx -+ # Remove the "Converter" and "Destructor" XML tags that are -+ # generated by "castxml" with a format that is different -+ # from that of "gccxml", and thus that are not properly -+ # understood by "mummy". Removing these tags does not seem -+ # to modify the output of "mummy". -+ COMMAND sed -+ ARGS -+ -i -+ "/^ <\\(Converter\\|Destructor\\) /d" -+ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx - ${header} - ${gccxml_EXECUTABLE} -+ VERBATIM - ) - - # Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/fixhurd.patch =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/fixhurd.patch 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/fixhurd.patch 2015-10-16 12:54:15 UTC (rev 20240) @@ -35,21 +35,8 @@ #ifdef _WIN32 Index: gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h =================================================================== ---- gdcm-2.4.1.orig/Utilities/socketxx/socket++/sockstream.h 2013-12-09 18:22:40.000000000 +0100 -+++ gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h 2013-12-10 09:15:48.378563355 +0100 -@@ -163,7 +163,7 @@ - msg_peek = MSG_PEEK, - msg_dontroute = MSG_DONTROUTE - --#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) -+#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) - ,msg_maxiovlen = MSG_MAXIOVLEN - #endif - }; -Index: gdcm-2.4.1/Utilities/socketxx/socket++/local.h -=================================================================== ---- gdcm-2.4.1.orig/Utilities/socketxx/socket++/local.h 2013-12-09 18:22:40.000000000 +0100 -+++ gdcm-2.4.1/Utilities/socketxx/socket++/local.h 2013-12-10 09:15:48.378563355 +0100 +--- gdcm-2.6.0.old/Utilities/socketxx/socket++/local.h 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/Utilities/socketxx/socket++/local.h 2015-10-16 14:20:06.073470902 +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: @@ -59,3 +46,16 @@ extern char* SYS_SIGLIST []; #endif #endif +Index: gdcm-2.4.1/Utilities/socketxx/socket++/local.h +=================================================================== +--- gdcm-2.6.0.old/Utilities/socketxx/socket++/sockstream.h 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/Utilities/socketxx/socket++/sockstream.h 2015-10-16 14:18:20.516146044 +0200 +@@ -163,7 +163,7 @@ + msg_peek = MSG_PEEK, + msg_dontroute = MSG_DONTROUTE + +-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__EMSCRIPTEN__)) ++#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__EMSCRIPTEN__) ) + ,msg_maxiovlen = MSG_MAXIOVLEN + #endif + }; Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/series =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/series 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/series 2015-10-16 12:54:15 UTC (rev 20240) @@ -2,4 +2,3 @@ fixhurd.patch linkvtkdoc.patch multiarch.patch -castxml.patch Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/toplevelskip.patch =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/toplevelskip.patch 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/toplevelskip.patch 2015-10-16 12:54:15 UTC (rev 20240) @@ -5,16 +5,18 @@ Index: gdcm-2.4.3/CMakeLists.txt =================================================================== ---- gdcm-2.4.3.orig/CMakeLists.txt 2014-07-26 17:19:49.000000000 +0200 -+++ gdcm-2.4.3/CMakeLists.txt 2014-07-29 15:13:50.822079829 +0200 -@@ -35,8 +35,8 @@ - get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH) - string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR) - if(INSOURCE OR INSOURCESUBDIR) -- message(FATAL_ERROR "GDCM requires an out of source Build. " -- "Please create a separate binary directory and run CMake there.") -+ # message(FATAL_ERROR "GDCM requires an out of source Build. " -+ # "Please create a separate binary directory and run CMake there.") +--- gdcm-2.6.0.old/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/CMakeLists.txt 2015-10-16 14:10:37.474589397 +0200 +@@ -36,9 +36,9 @@ + get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH) + string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR) + if(INSOURCE OR INSOURCESUBDIR) +- message(FATAL_ERROR "GDCM requires an out of source Build. " +- "Please create a separate binary directory and run CMake there. " +- "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD") ++# message(FATAL_ERROR "GDCM requires an out of source Build. " ++# "Please create a separate binary directory and run CMake there. " ++# "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD") + endif() endif() - #---------------------------------------------------------------------------- Modified: trunk/packages/gdcm/prepare-2.6/debian/rules =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/rules 2015-10-16 12:46:52 UTC (rev 20239) +++ trunk/packages/gdcm/prepare-2.6/debian/rules 2015-10-16 12:54:15 UTC (rev 20240) @@ -53,7 +53,7 @@ -DGDCM_BUILD_SHARED_LIBS:BOOL=ON \ -DGDCM_WRAP_PYTHON:BOOL=ON \ -DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \ - -DGDCM_WRAP_JAVA:BOOL=ON \ + -DGDCM_WRAP_JAVA:BOOL=OFF \ -DGDCM_WRAP_PHP:BOOL=ON \ -DGDCM_USE_PVRG:BOOL=ON \ -DGDCM_USE_SYSTEM_PVRG:BOOL=ON \ @@ -69,7 +69,7 @@ -DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON \ -DGDCM_USE_SYSTEM_JSON:BOOL=ON \ -DGDCM_USE_PARAVIEW:BOOL=OFF \ - -DGDCM_USE_ACTIVIZ:BOOL=ON \ + -DGDCM_USE_ACTIVIZ:BOOL=OFF \ -DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=ON \ -DGDCM_USE_SYSTEM_SOCKETXX:BOOL=ON \ -DPython_ADDITIONAL_VERSIONS:STRING=$(PYVER) \ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
