diff -Nru gdcm-2.8.7/debian/changelog gdcm-2.8.7/debian/changelog --- gdcm-2.8.7/debian/changelog 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/changelog 2018-10-23 00:07:16.000000000 +0000 @@ -1,28 +1,14 @@ -gdcm (2.8.7-3) unstable; urgency=medium +gdcm (2.8.7-3+rpi1) buster-staging; urgency=medium - * d/control: Add conflict with python2 packages, Closes: #908472 + [Changes backported from 2.8.7-4 by Gianfranco Costamagna] + * debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch: + - adapt to new poppler 0.69 with upstream patch - -- Gert Wollny Mon, 01 Oct 2018 20:48:07 +0200 + [Changes backported from 2.8.7-5 by Gianfranco Costamagna] + * d/p/5083513138fc90aa602b93293d2e44ae73e883b0.patch + - grab an additional fix from Ubuntu -gdcm (2.8.7-2) unstable; urgency=medium - - [ Andreas Tille ] - * Remove myself from Uploaders - - [ Gert Wollny ] - * switch to python3 Closes: #906535 - * d/control.in: Depend on python3 versions of packages - * d/dontrol: Build-depend only on default python3 version, the - current gdcm build only supports one python version at a time - * d/.gitlab: build from master branch - - -- Gert Wollny Sun, 09 Sep 2018 13:36:59 +0200 - -gdcm (2.8.7-1python3exp1) experimental; urgency=medium - - * Experimental upload with python3 support - - -- Gert Wollny Sat, 30 Jun 2018 12:02:59 +0200 + -- Peter Michael Green Tue, 23 Oct 2018 00:07:16 +0000 gdcm (2.8.7-1) unstable; urgency=medium @@ -32,7 +18,7 @@ -- Gert Wollny Sat, 30 Jun 2018 11:41:20 +0200 -gdcm (2.8.6-2) unstable; urgency=medium +gdcm (2.8.6-3) unstable; urgency=medium * d/p/gdcm-fix-xslt-maxdepth.patch set maxdeph Closes: #901519 * d/control: remove useless python version field @@ -59,20 +45,6 @@ -- Gert Wollny Sun, 29 Apr 2018 10:30:49 +0200 -gdcm (2.8.5-1~exp1) experimental; urgency=medium - - * Move to vtk7 and python3 - * New upstream version 2.8.5 - * d/gdcm-doc.doc-base: Update version umber in pdf file - - -- Gert Wollny Tue, 10 Apr 2018 09:04:33 +0200 - -gdcm (2.8.4-2) unstable; urgency=medium - - * d/rules: update default java version on all archs - - -- Gert Wollny Mon, 02 Apr 2018 19:12:36 +0200 - gdcm (2.8.4-1) unstable; urgency=medium * New upstream version 2.8.4 diff -Nru gdcm-2.8.7/debian/control gdcm-2.8.7/debian/control --- gdcm-2.8.7/debian/control 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/control 2018-06-30 09:41:20.000000000 +0000 @@ -2,7 +2,8 @@ Section: libs Priority: optional Maintainer: Debian Med Packaging Team -Uploaders: Steve M. Robbins , +Uploaders: Andreas Tille , + Steve M. Robbins , Sébastien Jodogne , Gert Wollny Build-Depends: cmake (>= 2.8.9), @@ -10,23 +11,23 @@ default-jdk, dh-strip-nondeterminism, dh-python, - python3-dev, + python-all-dev, pvrg-jpeg, uuid-dev, libz-dev, libexpat-dev, swig3.0, javahelper, - libvtk7-dev, + libvtk6-dev, libcharls-dev (>= 1.1.0), libopenjp2-7-dev, - libvtk7-java, + libvtk6-java, libxml2-dev, libjson-c-dev, libpoppler-private-dev, libssl-dev, ninja-build, - python3-vtk7 (>= 7.1.1-1~exp4), + python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev, @@ -34,7 +35,7 @@ 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: vtk7-doc, +Build-Depends-Indep: vtk6-doc, doxygen, doxygen-latex, ghostscript, @@ -99,12 +100,11 @@ CLI bindings to the GDCM DICOM library. It allows developers to use GDCM from C# environment. -Package: python3-gdcm +Package: python-gdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm2.8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.8 (= ${binary:Version}) Provides: ${python:Provides} -Conflicts: python-gdcm Description: Grassroots DICOM Python bindings Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -150,13 +150,12 @@ . VTK CLI bindings to the GDCM DICOM library. -Package: python3-vtkgdcm +Package: python-vtkgdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm2.8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.8 (= ${binary:Version}) Provides: ${python:Provides} -Suggests: python3-gdcm -Conflicts: python-vtkgdcm +Suggests: python-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 diff -Nru gdcm-2.8.7/debian/control.in gdcm-2.8.7/debian/control.in --- gdcm-2.8.7/debian/control.in 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/control.in 2018-06-30 09:41:20.000000000 +0000 @@ -2,7 +2,8 @@ Section: libs Priority: optional Maintainer: Debian Med Packaging Team -Uploaders: Steve M. Robbins , +Uploaders: Andreas Tille , + Steve M. Robbins , Sébastien Jodogne , Gert Wollny Build-Depends: cmake (>= 2.8.9), @@ -10,23 +11,23 @@ default-jdk, dh-strip-nondeterminism, dh-python, - python3-dev, + python-all-dev, pvrg-jpeg, uuid-dev, libz-dev, libexpat-dev, swig3.0, javahelper, - libvtk7-dev, + libvtk6-dev, libcharls-dev (>= 1.1.0), libopenjp2-7-dev, - libvtk7-java, + libvtk6-java, libxml2-dev, libjson-c-dev, libpoppler-private-dev, libssl-dev, ninja-build, - python3-vtk7 (>= 7.1.1-1~exp4), + python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev, @@ -34,13 +35,14 @@ mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@], xsltproc, docbook-xsl-ns -Build-Depends-Indep: vtk7-doc, +Build-Depends-Indep: vtk6-doc, doxygen, doxygen-latex, ghostscript, graphviz Build-Conflicts: libopenjpeg-dev Standards-Version: 4.1.4 +X-Python-Version: @PYVER@ Vcs-Browser: https://salsa.debian.org/med-team/gdcm Vcs-Git: https://salsa.debian.org/med-team/gdcm.git Homepage: http://gdcm.sourceforge.net/ @@ -99,10 +101,10 @@ CLI bindings to the GDCM DICOM library. It allows developers to use GDCM from C# environment. -Package: python3-gdcm +Package: python-gdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm2.8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python: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 @@ -149,12 +151,12 @@ . VTK CLI bindings to the GDCM DICOM library. -Package: python3-vtkgdcm +Package: python-vtkgdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm2.8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.8 (= ${binary:Version}) Provides: ${python:Provides} -Suggests: python3-gdcm +Suggests: python-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 diff -Nru gdcm-2.8.7/debian/.gitlab-ci.yml gdcm-2.8.7/debian/.gitlab-ci.yml --- gdcm-2.8.7/debian/.gitlab-ci.yml 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/.gitlab-ci.yml 2018-06-30 09:41:20.000000000 +0000 @@ -8,7 +8,7 @@ script: - git checkout pristine-tar - git pull - - git checkout master + - git checkout master - git pull # silence build to not exceed build log size of gitlab-ci - gbp buildpackage -uc -us 2>&1 >../build.log diff -Nru gdcm-2.8.7/debian/patches/03_linkvtkdoc.patch gdcm-2.8.7/debian/patches/03_linkvtkdoc.patch --- gdcm-2.8.7/debian/patches/03_linkvtkdoc.patch 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/patches/03_linkvtkdoc.patch 2018-06-30 09:41:20.000000000 +0000 @@ -1,5 +1,6 @@ -Description: Correct use of scripts from vtk7-doc - In vtk7-doc these scripts are installed uncompressed. +Description: Correct use of scripts from vtk6-doc + In vtk6-doc these scripts are installed compresses. The patch + takes care of providing uncompressed versions. 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. @@ -24,8 +25,8 @@ - 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-7.1/doxygen") -+ set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-7.1/doxygen") ++ if(EXISTS "/usr/share/vtk-6.3/doxygen") ++ set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-6.3/doxygen") else() - message(WARNING "DOXYGEN_SOURCE_DIR need to be set.") + message("DOXYGEN_SOURCE_DIR need to be set.") diff -Nru gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch --- gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch 1970-01-01 00:00:00.000000000 +0000 +++ gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch 2018-10-23 00:02:16.000000000 +0000 @@ -0,0 +1,74 @@ +From 5083513138fc90aa602b93293d2e44ae73e883b0 Mon Sep 17 00:00:00 2001 +From: Mathieu Malaterre +Date: Thu, 18 Oct 2018 10:33:48 +0200 +Subject: [PATCH] Adapt to new poppler API + +Bug #462 +--- + Applications/Cxx/gdcminfo.cxx | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx +index d926a2a8e..2c510d7df 100644 +--- a/Applications/Cxx/gdcminfo.cxx ++++ b/Applications/Cxx/gdcminfo.cxx +@@ -189,7 +189,7 @@ static int checkdeflated(const char *name) + static std::string getInfoDate(Dict *infoDict, const char *key) + { + Object obj; +- char *s; ++ const char *s; + int year, mon, day, hour, min, sec, n; + struct tm tmStruct; + //char buf[256]; +@@ -201,7 +201,8 @@ static std::string getInfoDate(Dict *infoDict, const char *key) + if (infoDict->lookup((char*)key, &obj)->isString()) + #endif + { +- s = obj.getString()->getCString(); ++ const GooString* gs = obj.getString(); ++ s = gs->getCString(); + if (s[0] == 'D' && s[1] == ':') + { + s += 2; +@@ -256,7 +257,7 @@ static std::string getInfoDate(Dict *infoDict, const char *key) + static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap) + { + Object obj; +- GooString *s1; ++ const GooString *s1; + GBool isUnicode; + Unicode u; + char buf[8]; +Index: gdcm-2.8.7/Applications/Cxx/gdcmpdf.cxx +=================================================================== +--- gdcm-2.8.7.orig/Applications/Cxx/gdcmpdf.cxx ++++ gdcm-2.8.7/Applications/Cxx/gdcmpdf.cxx +@@ -37,7 +37,7 @@ + static std::string getInfoDate(Dict *infoDict, const char *key) + { + Object obj; +- char *s; ++ const char *s; + int year, mon, day, hour, min, sec, n; + struct tm tmStruct; + //char buf[256]; +@@ -49,7 +49,8 @@ + if (infoDict->lookup((char*)key, &obj)->isString()) + #endif + { +- s = obj.getString()->getCString(); ++ const GooString* gs = obj.getString(); ++ s = gs->getCString(); + if (s[0] == 'D' && s[1] == ':') + { + s += 2; +@@ -104,7 +105,7 @@ + static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, GBool & unicode) + { + Object obj; +- GooString *s1; ++ const GooString *s1; + GBool isUnicode = gFalse; + Unicode u; + char buf[8]; diff -Nru gdcm-2.8.7/debian/patches/add_cxx11_vtk_defines.patch gdcm-2.8.7/debian/patches/add_cxx11_vtk_defines.patch --- gdcm-2.8.7/debian/patches/add_cxx11_vtk_defines.patch 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/patches/add_cxx11_vtk_defines.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Author: Gert Wollny -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 diff -Nru gdcm-2.8.7/debian/patches/series gdcm-2.8.7/debian/patches/series --- gdcm-2.8.7/debian/patches/series 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/patches/series 2018-10-23 00:02:47.000000000 +0000 @@ -6,5 +6,6 @@ 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 +5083513138fc90aa602b93293d2e44ae73e883b0.patch diff -Nru gdcm-2.8.7/debian/python3-gdcm.install gdcm-2.8.7/debian/python3-gdcm.install --- gdcm-2.8.7/debian/python3-gdcm.install 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/python3-gdcm.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib/python3*/dist-packages/gdcm.py -usr/lib/python3*/dist-packages/gdcmswig.py -usr/lib/python3*/dist-packages/_gdcmswig.so* diff -Nru gdcm-2.8.7/debian/python3-vtkgdcm.install gdcm-2.8.7/debian/python3-vtkgdcm.install --- gdcm-2.8.7/debian/python3-vtkgdcm.install 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/python3-vtkgdcm.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/python3*/dist-packages/vtkgdcm* -usr/lib/*/libvtkgdcmPythonD.so* diff -Nru gdcm-2.8.7/debian/python3-vtkgdcm.lintian-overrides gdcm-2.8.7/debian/python3-vtkgdcm.lintian-overrides --- gdcm-2.8.7/debian/python3-vtkgdcm.lintian-overrides 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/python3-vtkgdcm.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# -# This is a C++ library, using symbols files here is quite a challange -# -python3-vtkgdcm: no-symbols-control-file - - -# This package provids a helper library for Python bindings -python3-vtkgdcm: package-name-doesnt-match-sonames - -# This seems to be needed for the python module -python3-vtkgdcm: non-dev-pkg-with-shlib-symlink diff -Nru gdcm-2.8.7/debian/python-gdcm.install gdcm-2.8.7/debian/python-gdcm.install --- gdcm-2.8.7/debian/python-gdcm.install 1970-01-01 00:00:00.000000000 +0000 +++ gdcm-2.8.7/debian/python-gdcm.install 2018-06-30 09:41:20.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib/python*/dist-packages/gdcm.py +usr/lib/python*/dist-packages/gdcmswig.py +usr/lib/python*/dist-packages/_gdcmswig.so* diff -Nru gdcm-2.8.7/debian/python-vtkgdcm.install gdcm-2.8.7/debian/python-vtkgdcm.install --- gdcm-2.8.7/debian/python-vtkgdcm.install 1970-01-01 00:00:00.000000000 +0000 +++ gdcm-2.8.7/debian/python-vtkgdcm.install 2018-06-30 09:41:20.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib/python*/dist-packages/vtkgdcm.py +usr/lib/python*/dist-packages/libvtkgdcmPython.so* +usr/lib/*/libvtkgdcmPythonD.so* diff -Nru gdcm-2.8.7/debian/python-vtkgdcm.lintian-overrides gdcm-2.8.7/debian/python-vtkgdcm.lintian-overrides --- gdcm-2.8.7/debian/python-vtkgdcm.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ gdcm-2.8.7/debian/python-vtkgdcm.lintian-overrides 2018-06-30 09:41:20.000000000 +0000 @@ -0,0 +1,11 @@ +# +# This is a C++ library, using symbols files here is quite a challange +# +python-vtkgdcm: no-symbols-control-file + + +# This package provids a helper library for Python bindings +python-vtkgdcm: package-name-doesnt-match-sonames + +# This seems to be needed for the python module +python-vtkgdcm: non-dev-pkg-with-shlib-symlink diff -Nru gdcm-2.8.7/debian/rules gdcm-2.8.7/debian/rules --- gdcm-2.8.7/debian/rules 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/rules 2018-06-30 09:41:20.000000000 +0000 @@ -46,11 +46,11 @@ endif %: - dh $@ $(WITH_CLI) --with python3 --with javahelper --buildsystem=cmake+ninja + dh $@ $(WITH_CLI) --with python2 --with javahelper --buildsystem=cmake+ninja -PYVER := $(shell py3versions -dv) -PYMODDIR := /usr/lib/$(shell py3versions -d) -VTKVERS=$(shell apt-cache policy libvtk7-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2) +PYVER := $(shell pyversions -dv) +PYMODDIR := /usr/lib/$(shell pyversions -r) +VTKVERS=$(shell apt-cache policy libvtk6-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2) # GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target) # Need to make sure to build using the same vtk/python version: @@ -94,7 +94,7 @@ -DGDCM_NO_VTKJAVA_LIBS_LINKING:BOOL=ON \ -DGDCM_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \ -DGDCM_USE_VTK:BOOL=ON \ - -DVTK_JAVA_JAR=/usr/share/java/vtk7.jar + -DVTK_JAVA_JAR=/usr/share/java/vtk6.jar override_dh_auto_configure: