Package: gdcm Version: 2.4.4-3 Severity: important Tags: patch
Dear maintainer, this is the ubuntu delta, fixing arm64 build failure (by disabling ACTIVIZ) and something else, like fixing python search directories and a fix on pdf generation. Not sure if all should be merged in debian, this is why I'm reporting the whole diff (stripped of the changelog and some other useless-for-debian stuff). Feel free to merge or drop at your own convenience! diff -Nru gdcm-2.4.4/debian/control gdcm-2.4.4/debian/control --- gdcm-2.4.4/debian/control 2014-09-24 14:41:14.000000000 +0200 +++ gdcm-2.4.4/debian/control 2014-10-29 12:03:37.000000000 +0100 @@ -9,7 +10,7 @@ uuid-dev, libz-dev, libexpat-dev, doxygen, swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper, libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev, - libpoppler-private-dev, libssl-dev, python-vtk, gccxml, libsocket++-dev, libpapyrus3-dev, + libpoppler-private-dev, libssl-dev, python-vtk, gccxml [!arm64], libsocket++-dev, libpapyrus3-dev, libactiviz.net-cil [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], mummy [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], cli-common-dev (>= 0.8~) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], diff -Nru gdcm-2.4.4/debian/control.in gdcm-2.4.4/debian/control.in --- gdcm-2.4.4/debian/control.in 2014-09-30 13:02:57.000000000 +0200 +++ gdcm-2.4.4/debian/control.in 2014-10-29 12:03:28.000000000 +0100 @@ -9,7 +10,7 @@ uuid-dev, libz-dev, libexpat-dev, doxygen, swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper, libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev, - libpoppler-private-dev, libssl-dev, python-vtk, gccxml, libsocket++-dev, libpapyrus3-dev, + libpoppler-private-dev, libssl-dev, python-vtk, gccxml [!arm64], libsocket++-dev, libpapyrus3-dev, libactiviz.net-cil [@DEB_MONO_ARCHS@], mummy [@DEB_MONO_ARCHS@], cli-common-dev (>= 0.8~) [@DEB_MONO_ARCHS@], diff -Nru gdcm-2.4.4/debian/patches/disablepdfopt.patch gdcm-2.4.4/debian/patches/disablepdfopt.patch --- gdcm-2.4.4/debian/patches/disablepdfopt.patch 1970-01-01 01:00:00.000000000 +0100 +++ gdcm-2.4.4/debian/patches/disablepdfopt.patch 2014-10-29 11:55:34.000000000 +0100 @@ -0,0 +1,18 @@ +Description: disable optimizing PDF documentation + pdfopt is no longer available in ghostscript, see + http://bugs.ghostscript.com/show_bug.cgi?id=694099 +Bug: https://sourceforge.net/p/gdcm/bugs/292/ +Author: Dmitry Shachnev <mity...@ubuntu.com> +Last-Update: 2013-06-02 + +--- a/Utilities/doxygen/CMakeLists.txt ++++ b/Utilities/doxygen/CMakeLists.txt +@@ -96,7 +96,7 @@ + # PDF building part: + # When building latex, we have to run a custom command to produce the pdf file: + if(UNIX AND GDCM_PDF_DOCUMENTATION) +- find_program(PDFOPT_EXECUTABLE pdfopt) ++ find_program(PDFOPT_EXECUTABLE cp) + find_program(SED_EXECUTABLE sed) + find_package(LATEX REQUIRED) + mark_as_advanced(PDFOPT_EXECUTABLE SED_EXECUTABLE) diff -Nru gdcm-2.4.4/debian/patches/fixpythonincludedirs.patch gdcm-2.4.4/debian/patches/fixpythonincludedirs.patch --- gdcm-2.4.4/debian/patches/fixpythonincludedirs.patch 1970-01-01 01:00:00.000000000 +0100 +++ gdcm-2.4.4/debian/patches/fixpythonincludedirs.patch 2014-10-29 11:45:36.000000000 +0100 @@ -0,0 +1,13 @@ +Index: gdcm-2.2.3/Wrapping/Python/CMakeLists.txt +=================================================================== +--- gdcm-2.2.3.orig/Wrapping/Python/CMakeLists.txt 2013-05-30 15:38:42.061419753 +0200 ++++ gdcm-2.2.3/Wrapping/Python/CMakeLists.txt 2013-05-30 15:38:42.057419753 +0200 +@@ -60,7 +60,7 @@ + else() + # just plain including pyconfig.h is working...until one crazy python dev decide otherwise... + include_directories( +- ${PYTHON_INCLUDE_PATH} ++ ${PYTHON_INCLUDE_DIRS} + ) + endif() + set_source_files_properties(gdcmswig.i PROPERTIES CPLUSPLUS ON) diff -Nru gdcm-2.4.4/debian/patches/series gdcm-2.4.4/debian/patches/series --- gdcm-2.4.4/debian/patches/series 2014-10-06 09:08:33.000000000 +0200 +++ gdcm-2.4.4/debian/patches/series 2014-10-29 11:48:59.000000000 +0100 @@ -2,3 +2,5 @@ fixhurd.patch linkvtkdoc.patch multiarch.patch +fixpythonincludedirs.patch +disablepdfopt.patch diff -Nru gdcm-2.4.4/debian/rules gdcm-2.4.4/debian/rules --- gdcm-2.4.4/debian/rules 2014-09-24 14:26:17.000000000 +0200 +++ gdcm-2.4.4/debian/rules 2014-10-29 12:03:19.000000000 +0100 @@ -26,6 +26,15 @@ endif export LD_LIBRARY_PATH +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +no_gccxml_architectures := arm64 +ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_gccxml_architectures))) + USE_ACTIVIZ = OFF +else + USE_ACTIVIZ = ON +endif + # deduce documentation option (build-indep target) ifeq "" "$(filter %-doc,$(shell dh_listpackages))" BUILDDOC = OFF @@ -69,7 +78,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=$(USE_ACTIVIZ) \ -DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=ON \ -DGDCM_USE_SYSTEM_SOCKETXX:BOOL=ON \ -DPython_ADDITIONAL_VERSIONS:STRING=$(PYVER) \ thanks, Gianfranco -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
