Author: malat Date: 2012-04-11 14:10:36 +0000 (Wed, 11 Apr 2012) New Revision: 10374
Added: trunk/packages/gdcm/trunk/debian/patches/fixundef.patch Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/control trunk/packages/gdcm/trunk/debian/control.in trunk/packages/gdcm/trunk/debian/patches/series trunk/packages/gdcm/trunk/debian/rules Log: Prepare next upload Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2012-04-11 13:24:44 UTC (rev 10373) +++ trunk/packages/gdcm/trunk/debian/changelog 2012-04-11 14:10:36 UTC (rev 10374) @@ -1,3 +1,10 @@ +gdcm (2.2.0-10) unstable; urgency=low + + * Fix some undefined symbols (reported upstream) + * Use javahelper to resolve java dependencies + + -- Mathieu Malaterre <[email protected]> Wed, 11 Apr 2012 16:09:49 +0200 + gdcm (2.2.0-9) unstable; urgency=low * Another attempt to really fix hurd-i386 compilation, Modified: trunk/packages/gdcm/trunk/debian/control =================================================================== --- trunk/packages/gdcm/trunk/debian/control 2012-04-11 13:24:44 UTC (rev 10373) +++ trunk/packages/gdcm/trunk/debian/control 2012-04-11 14:10:36 UTC (rev 10374) @@ -7,7 +7,7 @@ Steve M. Robbins <[email protected]> Build-Depends: debhelper (>= 8), python-all-dev, libvtk-java, pvrg-jpeg, uuid-dev, libz-dev, libexpat-dev, doxygen-latex, ghostscript, - swig, cmake, libvtk5-dev, libcharls-dev, + swig, cmake, libvtk5-dev, libcharls-dev, javahelper, libopenjpeg-dev, graphviz, default-jdk, libpoppler-private-dev, libssl-dev, python-vtk, gccxml, libactiviz.net-cil [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc], Modified: trunk/packages/gdcm/trunk/debian/control.in =================================================================== --- trunk/packages/gdcm/trunk/debian/control.in 2012-04-11 13:24:44 UTC (rev 10373) +++ trunk/packages/gdcm/trunk/debian/control.in 2012-04-11 14:10:36 UTC (rev 10374) @@ -7,7 +7,7 @@ Steve M. Robbins <[email protected]> Build-Depends: debhelper (>= 8), python-all-dev, libvtk-java, pvrg-jpeg, uuid-dev, libz-dev, libexpat-dev, doxygen-latex, ghostscript, - swig, cmake, libvtk5-dev, libcharls-dev, + swig, cmake, libvtk5-dev, libcharls-dev, javahelper, libopenjpeg-dev, graphviz, default-jdk, libpoppler-private-dev, libssl-dev, python-vtk, gccxml, libactiviz.net-cil [@DEB_MONO_ARCHS@], Added: trunk/packages/gdcm/trunk/debian/patches/fixundef.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/fixundef.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/fixundef.patch 2012-04-11 14:10:36 UTC (rev 10374) @@ -0,0 +1,50 @@ +Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt +=================================================================== +--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-04-11 12:52:48.000000000 +0000 ++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-04-11 14:02:25.000000000 +0000 +@@ -12,11 +12,11 @@ + vtkGDCMMedicalImageProperties.cxx + ) + +-IF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS) ++IF(GDCM_HAVE_PTHREAD_H) + SET(vtkgdcm_SRCS ${vtkgdcm_SRCS} + vtkGDCMThreadedImageReader.cxx + ) +-ENDIF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS) ++ENDIF(GDCM_HAVE_PTHREAD_H) + + INCLUDE(${VTK_USE_FILE}) + +@@ -127,6 +127,9 @@ + + SET_TARGET_PROPERTIES(${VTKGDCM_NAME} PROPERTIES ${GDCM_LIBRARY_PROPERTIES}) + TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS}) ++IF(GDCM_HAVE_PTHREAD_H) ++TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} pthread) ++ENDIF(GDCM_HAVE_PTHREAD_H) + # prevent viral dep of vtkgdcm + SET_PROPERTY(TARGET ${VTKGDCM_NAME} PROPERTY LINK_INTERFACE_LIBRARIES "") + IF(NOT GDCM_INSTALL_NO_LIBRARIES) +@@ -467,6 +470,7 @@ + TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged ${Mummy_RUNTIME_LINK_LIBRARIES}) + ENDIF(WIN32) + TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtk${kit}) ++ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtkCommon) + # TODO -- rename this CopyLibraries here too... + ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged Kitware.mummy.CopyLibraries2) + ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged "vtk${kit}GenerateWrappers") +@@ -688,9 +692,12 @@ + # do not set the version on the PythonD module: + SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES}) + TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME}) +- FOREACH(c ${vtkgdcm_LIBS}) ++ FOREACH(c ${vtkgdcm_LIBS} vtkFiltering) + TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION}) + ENDFOREACH(c) ++ if(TARGET vtkPythonCore) ++ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD vtkPythonCore) ++ endif() + TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Python ${VTKGDCM_NAME}PythonD) + # Python extension modules on Windows must have the extension ".pyd" + # instead of ".dll" as of Python 2.5. Older python versions do support Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2012-04-11 13:24:44 UTC (rev 10373) +++ trunk/packages/gdcm/trunk/debian/patches/series 2012-04-11 14:10:36 UTC (rev 10374) @@ -8,3 +8,4 @@ kfreebsdfix.patch removepythonlink.patch fixhurd.patch +fixundef.patch Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2012-04-11 13:24:44 UTC (rev 10373) +++ trunk/packages/gdcm/trunk/debian/rules 2012-04-11 14:10:36 UTC (rev 10374) @@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk -export LDFLAGS='-Wl,--as-needed' +export LDFLAGS=-Wl,--as-needed # to please dpkg-shlibdeps and java private libs in /usr/lib/jni LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni @@ -26,7 +26,7 @@ export LD_LIBRARY_PATH %: - dh $@ $(WITH_CLI) --with python2 --parallel + dh $@ $(WITH_CLI) --with python2 --with javahelper --parallel PYVER := $(shell pyversions -dv) PYMODDIR := /usr/lib/$(shell pyversions -r) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
