Move to vtk7 and python3 (61678534) · Commits · Debian Med / gdcm

debian/control

+10 −10

Original line number	Diff line number	Diff line
		@@ -11,23 +11,23 @@ Build-Depends: cmake (>= 2.8.9),
		default-jdk,
		dh-strip-nondeterminism,
		dh-python,
		python-all-dev,
		python3-all-dev,
		pvrg-jpeg,
		uuid-dev,
		libz-dev,
		libexpat-dev,
		swig3.0,
		javahelper,
		libvtk6-dev,
		libvtk7-dev,
		libcharls-dev (>= 1.1.0),
		libopenjp2-7-dev,
		libvtk6-java,
		libvtk7-java,
		libxml2-dev,
		libjson-c-dev,
		libpoppler-private-dev,
		libssl-dev,
		ninja-build,
		python-vtk6,
		python3-vtk7,
		castxml,
		libsocket++-dev,
		libpapyrus3-dev,
		@@ -35,7 +35,7 @@ Build-Depends: cmake (>= 2.8.9),
		mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64],
		xsltproc,
		docbook-xsl-ns
		Build-Depends-Indep: vtk6-doc,
		Build-Depends-Indep: vtk7-doc,
		doxygen,
		doxygen-latex,
		ghostscript,
		@@ -100,10 +100,10 @@ Description: Grassroots DICOM CLI bindings
		CLI bindings to the GDCM DICOM library. It allows developers to use
		GDCM from C# environment.

		Package: python-gdcm
		Package: python3-gdcm
		Section: python
		Architecture: any
		Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.8 (= ${binary:Version})
		Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm2.8 (= ${binary:Version})
		Provides: ${python:Provides}
		Description: Grassroots DICOM Python bindings
		Grassroots DiCoM is a C++ library for DICOM medical files. It is
		@@ -150,12 +150,12 @@ Description: Grassroots DICOM VTK CLI bindings
		.
		VTK CLI bindings to the GDCM DICOM library.

		Package: python-vtkgdcm
		Package: python3-vtkgdcm
		Section: python
		Architecture: any
		Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.8 (= ${binary:Version})
		Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm2.8 (= ${binary:Version})
		Provides: ${python:Provides}
		Suggests: python-gdcm
		Suggests: python3-gdcm
		Description: Grassroots DICOM VTK/Python bindings
		Grassroots DiCoM is a C++ library for DICOM medical files. It is
		automatically wrapped to python/C#/Java (using swig). It supports

debian/patches/03_linkvtkdoc.patch

+4 −5

Original line number	Diff line number	Diff line
		Description: Correct use of scripts from vtk6-doc
		In vtk6-doc these scripts are installed compresses. The patch
		takes care of providing uncompressed versions.
		Description: Correct use of scripts from vtk7-doc
		In vtk7-doc these scripts are installed uncompressed.
		In addition the patch changes the vtk doxygen source directory and
		incorporates an patch to link to the VTK doc and replace PNG by SVG,
		Merged to one patch because they overlap partially.
		@@ -25,8 +24,8 @@ Author: Gert Wollny <gw.fossdev@gmail.com>, Mathieu Malaterre <malat@debian.org>
		- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html")
		- elseif(EXISTS "/usr/share/doc/vtk6-doc/doxygen")
		- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen")
		+ if(EXISTS "/usr/share/vtk-6.3/doxygen")
		+ set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-6.3/doxygen")
		+ if(EXISTS "/usr/share/vtk-7.1/doxygen")
		+ set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-7.1/doxygen")
		else()
		- message(WARNING "DOXYGEN_SOURCE_DIR need to be set.")
		+ message("DOXYGEN_SOURCE_DIR need to be set.")

debian/patches/add_cxx11_vtk_defines.patch

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		Author: Gert Wollny <gewo@debian.org>
		Description: Add VTK defines for C++11 constructs to the swig interface file
		--- a/Utilities/VTK/vtkgdcm.i
		+++ b/Utilities/VTK/vtkgdcm.i
		@@ -31,12 +31,17 @@
		#endif

		%{
		-//#define VTK_MAJOR_VERSION 6
		-//#define VTK_MINOR_VERSION 2
		-//#define VTK_BUILD_VERSION 0
		-//#define VTK_VERSION "6.2.0"
		+//#define VTK_MAJOR_VERSION 7
		+//#define VTK_MINOR_VERSION 1
		+//#define VTK_BUILD_VERSION 1
		+//#define VTK_VERSION "7.1.1"
		%}

		+#define VTK_OVERRIDE override
		+#define VTK_FINAL final
		+#define VTK_DELETE_FUNCTION = delete
		+#define VTK_NEWINSTANCE
		+#define VTK_LEGACY(X)

		%{
		// Let's reproduce the stack of include, when one would include vtkSetGet:
		@@ -118,7 +123,6 @@
		#endif


		-
		#define GDCM_EXPORT
		#define VTK_EXPORT
		#define VTK_COMMON_EXPORT

debian/patches/series

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,5 +6,5 @@ unforce_cxx98.patch
		use_swig_add_library_for_csharp.patch
		enable_ninja_build.patch
		gdcm-fix-xslt-maxdepth.patch

		fix-vtkjava-build-dir.patch
		add_cxx11_vtk_defines.patch

debian/python-gdcm.install

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		usr/lib/python*/dist-packages/gdcm.py
		usr/lib/python*/dist-packages/gdcmswig.py
		usr/lib/python/dist-packages/_gdcmswig.so