Author: gert-guest Date: 2015-10-16 16:04:39 +0000 (Fri, 16 Oct 2015) New Revision: 20243
Modified: trunk/packages/gdcm/prepare-2.6/debian/control.in trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch trunk/packages/gdcm/prepare-2.6/debian/rules Log: correct version depended parts of the debian scripts Modified: trunk/packages/gdcm/prepare-2.6/debian/control.in =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/control.in 2015-10-16 15:28:41 UTC (rev 20242) +++ trunk/packages/gdcm/prepare-2.6/debian/control.in 2015-10-16 16:04:39 UTC (rev 20243) @@ -19,7 +19,7 @@ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gdcm/trunk/ Homepage: http://gdcm.sourceforge.net/ -Package: libgdcm2.4 +Package: libgdcm2.6 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -51,7 +51,7 @@ Package: libgdcm2-dev Section: libdevel Architecture: any -Depends: libgdcm2.4 (= ${binary:Version}), ${misc:Depends} +Depends: libgdcm2.6 (= ${binary:Version}), ${misc:Depends} Description: Grassroots DICOM development libraries and headers Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -61,12 +61,12 @@ GDCM, but are needed to build plugins or programs that link against libgdcm. -Package: libgdcm2.4-dbg +Package: libgdcm2.6-dbg Architecture: any Section: debug Priority: extra Multi-Arch: same -Depends: libgdcm2.4 (= ${binary:Version}), ${misc:Depends} +Depends: libgdcm2.6 (= ${binary:Version}), ${misc:Depends} Description: Grassroots DICOM runtime libraries, debug version Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -102,7 +102,7 @@ Package: python-gdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.6 (= ${binary:Version}) Provides: ${python:Provides} Description: Grassroots DICOM Python bindings Grassroots DiCoM is a C++ library for DICOM medical files. It is @@ -111,7 +111,7 @@ . Python bindings to the GDCM DICOM library. -Package: libvtkgdcm2.4 +Package: libvtkgdcm2.6 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -127,7 +127,7 @@ Package: libvtkgdcm2-dev Section: libdevel Architecture: any -Depends: libvtkgdcm2.4 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends} +Depends: libvtkgdcm2.6 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends} Description: Grassroots DICOM VTK development libraries and headers Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -140,7 +140,7 @@ Package: libvtkgdcm-cil Section: cli-mono Architecture: @DEB_MONO_ARCHS@ -Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.6 (= ${binary:Version}) Suggests: libgdcm-cil Description: Grassroots DICOM VTK CLI bindings Grassroots DiCoM is a C++ library for DICOM medical files. It is @@ -152,7 +152,7 @@ Package: php5-vtkgdcm Section: php Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.6 (= ${binary:Version}) Suggests: php-gdcm Description: Grassroots DICOM VTK PHP bindings Grassroots DiCoM is a C++ library for DICOM medical files. It is @@ -164,7 +164,7 @@ Package: python-vtkgdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.6 (= ${binary:Version}) Provides: ${python:Provides} Suggests: python-gdcm Description: Grassroots DICOM VTK/Python bindings Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch 2015-10-16 15:28:41 UTC (rev 20242) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch 2015-10-16 16:04:39 UTC (rev 20243) @@ -1,6 +1,6 @@ -diff -ur gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0.obsolete.0.0988784821975095/Utilities/VTK/CMakeLists.txt +diff -ru gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0/Utilities/VTK/CMakeLists.txt --- gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200 -+++ gdcm-2.6.0.obsolete.0.0988784821975095/Utilities/VTK/CMakeLists.txt 2015-10-16 16:54:45.316439853 +0200 ++++ gdcm-2.6.0/Utilities/VTK/CMakeLists.txt 2015-10-16 17:28:48.000000000 +0200 @@ -740,9 +740,9 @@ # do not set the version on the Python module: #set_target_properties(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES}) @@ -14,9 +14,9 @@ if(TARGET vtkPythonCore) target_link_libraries(${VTKGDCM_NAME}PythonD vtkPythonCore) endif() -diff -ur gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i gdcm-2.6.0.obsolete.0.0988784821975095/Utilities/VTK/vtkgdcm.i +diff -ru gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i gdcm-2.6.0/Utilities/VTK/vtkgdcm.i --- gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i 2015-09-03 16:42:12.000000000 +0200 -+++ gdcm-2.6.0.obsolete.0.0988784821975095/Utilities/VTK/vtkgdcm.i 2015-10-16 16:47:42.419780119 +0200 ++++ gdcm-2.6.0/Utilities/VTK/vtkgdcm.i 2015-10-16 17:42:20.541502614 +0200 @@ -31,10 +31,10 @@ #endif @@ -31,7 +31,33 @@ %} -@@ -119,6 +119,13 @@ +@@ -101,17 +101,24 @@ + //using My.Own.Namespace; + //%} + +-#ifdef USEACTIVIZ ++#if defined( USEACTIVIZ ) || defined (SWIGCSHARP) + %typemap(csimports) SWIGTYPE %{ + // I need to duplicate those also: + using System; + using System.Runtime.InteropServices; ++%} ++#endif ++ ++#if defined( USEACTIVIZ ) ++%typemap(csimports) SWIGTYPE %{ + // my special import: + using Kitware.VTK; + //using Kitware.mummy.Runtime; + %} + #endif + ++ ++ + #define GDCM_EXPORT + #define VTK_EXPORT + #define VTK_COMMON_EXPORT +@@ -119,6 +126,13 @@ #define VTK_IO_EXPORT #define VTK_IMAGING_EXPORT #define VTK_RENDERING_EXPORT Modified: trunk/packages/gdcm/prepare-2.6/debian/rules =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/rules 2015-10-16 15:28:41 UTC (rev 20242) +++ trunk/packages/gdcm/prepare-2.6/debian/rules 2015-10-16 16:04:39 UTC (rev 20243) @@ -89,9 +89,9 @@ override_dh_auto_install: # See #664188 - sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.4/GDCMTargets-*.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.6/GDCMTargets-*.cmake # See #711214 - sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.4/GDCMTargets.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.6/GDCMTargets.cmake dh_auto_install # PHP mkdir -p debian/tmp/$(PHP_EX) @@ -107,7 +107,7 @@ #mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/ override_dh_strip: - dh_strip --dbg-package=libgdcm2.4-dbg + dh_strip --dbg-package=libgdcm2.6-dbg override_dh_clideps: ifeq ($(DEB_WRAP_CSHARP), 1) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
