Author: malat-guest Date: 2012-01-31 16:34:19 +0000 (Tue, 31 Jan 2012) New Revision: 9503
Added: trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/control trunk/packages/gdcm/trunk/debian/patches/series trunk/packages/gdcm/trunk/debian/rules Log: ready to upload gdcm 2.2.0 Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2012-01-31 16:05:36 UTC (rev 9502) +++ trunk/packages/gdcm/trunk/debian/changelog 2012-01-31 16:34:19 UTC (rev 9503) @@ -1,8 +1,11 @@ -gdcm (2.2.0-2) UNRELEASED; urgency=low +gdcm (2.2.0-2) unstable; urgency=medium - * Fix compilation on kFreeBSD + * Fix compilation on kFreeBSD. + * Add a check to match DEB_MONO_ARCHS value. + * Update list of supported arch for mono (remove s390). Closes: #657779 + * Remove explicit link to libpython2.7. Closes: #658137 - -- Mathieu Malaterre <[email protected]> Sat, 28 Jan 2012 15:43:10 +0100 + -- Mathieu Malaterre <[email protected]> Tue, 31 Jan 2012 17:03:26 +0100 gdcm (2.2.0-1) experimental; urgency=low Modified: trunk/packages/gdcm/trunk/debian/control =================================================================== --- trunk/packages/gdcm/trunk/debian/control 2012-01-31 16:05:36 UTC (rev 9502) +++ trunk/packages/gdcm/trunk/debian/control 2012-01-31 16:34:19 UTC (rev 9503) @@ -10,10 +10,11 @@ uuid-dev, libz-dev, libexpat-dev, doxygen-latex, ghostscript, swig, cmake, libvtk5-dev, libcharls-dev, libopenjpeg-dev, graphviz, default-jdk, - libpoppler-dev, libssl-dev, python-vtk, - libactiviz.net-cil, mummy, gccxml, - cli-common-dev (>= 0.5.7) [!alpha !mips !mipsel !m68k !hppa], - mono-devel (>= 2.0) [!alpha !mips !mipsel !m68k !hppa] + libpoppler-dev, libssl-dev, python-vtk, gccxml, + libactiviz.net-cil [!alpha !mips !mipsel !m68k !hppa !s390 !s390x], + mummy [!alpha !mips !mipsel !m68k !hppa !s390 !s390x], + cli-common-dev (>= 0.8~) [!alpha !mips !mipsel !m68k !hppa !s390 !s390x], + mono-devel (>= 2.10.5) [!alpha !mips !mipsel !m68k !hppa !s390 !s390x] Standards-Version: 3.9.2 X-Python-Version: 2.7 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/ @@ -74,7 +75,7 @@ Package: libgdcm-cil Section: cli-mono -Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends} Description: Grassroots DICOM CLI bindings Grassroots DiCoM is a C++ library for DICOM medical files. It is @@ -135,7 +136,7 @@ Package: libvtkgdcm-cil Section: cli-mono -Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.2 (= ${binary:Version}) Suggests: libgdcm-cil Description: Grassroots DICOM VTK CLI bindings Added: trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch 2012-01-31 16:34:19 UTC (rev 9503) @@ -0,0 +1,13 @@ +Index: gdcm-2.2.0/Wrapping/Python/CMakeLists.txt +=================================================================== +--- gdcm-2.2.0.orig/Wrapping/Python/CMakeLists.txt 2012-01-31 17:05:42.000000000 +0100 ++++ gdcm-2.2.0/Wrapping/Python/CMakeLists.txt 2012-01-31 17:05:52.000000000 +0100 +@@ -83,7 +83,7 @@ + # the other gdcm lib. bad !!! + #SET (SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS ${SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/docstrings.i) + SWIG_ADD_MODULE(${GDCM_PYTHON_IMPLEMENTATION_NAME} python gdcmswig.i gdcmPythonFilter.cxx) +-SWIG_LINK_LIBRARIES(${GDCM_PYTHON_IMPLEMENTATION_NAME} gdcmMEXD gdcmMSFF gdcmIOD ${PYTHON_LIBRARIES}) ++SWIG_LINK_LIBRARIES(${GDCM_PYTHON_IMPLEMENTATION_NAME} gdcmMEXD gdcmMSFF gdcmIOD) # ${PYTHON_LIBRARIES}) + + #MESSAGE(SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS) + #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gdcm.pth.in Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2012-01-31 16:05:36 UTC (rev 9502) +++ trunk/packages/gdcm/trunk/debian/patches/series 2012-01-31 16:34:19 UTC (rev 9503) @@ -6,3 +6,4 @@ stableapi.patch activiz.net.patch kfreebsdfix.patch +removepythonlink.patch Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2012-01-31 16:05:36 UTC (rev 9502) +++ trunk/packages/gdcm/trunk/debian/rules 2012-01-31 16:34:19 UTC (rev 9503) @@ -8,16 +8,21 @@ export LDFLAGS='-Wl,--as-needed' # to please dpkg-shlibdeps and java private libs in /usr/lib/jni -export LD_LIBRARY_PATH+=:/usr/lib/jni +LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni # Mono is not available for all Debian architectures. ifeq ($(shell dh_listpackages | grep -q cil && echo yes),yes) WITH_CLI = --with cli DEB_WRAP_CSHARP = 1 +# required for DEB_MONO_ARCHS +include /usr/share/mono/mono-archs.make +# dpkg-shlibdeps needs to know where is libKitware.mummy.Runtime.Unmanaged.so +LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/cli/Kitware.mummy.Runtime-1.0 else WITH_CLI = DEB_WRAP_CSHARP = 0 endif +export LD_LIBRARY_PATH %: dh $@ $(WITH_CLI) --with python2 --parallel @@ -76,5 +81,11 @@ #build-arch: # $(MAKE) +mono_archs=$(DEB_MONO_ARCHS) +gdcm_archs="$(shell grep -2 libvtkgdcm-cil debian/control | grep Architecture | cut -d: -f2 | tr " " "\n" | sort -g)" +mono_sorted="$(shell echo ' $(mono_archs)' | tr ' ' '\n' | sort -g)" +check-mono-archs: + if [ $(gdcm_archs) != $(mono_sorted) ]; then echo "Incompatible arch, should be $(mono_archs)"; exit 1; fi + get-orig-source: uscan --verbose --force-download _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
