Author: malat-guest Date: 2009-06-22 17:03:28 +0000 (Mon, 22 Jun 2009) New Revision: 3525
Added: trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/changelog trunk/packages/gdcm/tags/2.0.10-5/debian/control trunk/packages/gdcm/tags/2.0.10-5/debian/libgdcm-cil.install trunk/packages/gdcm/tags/2.0.10-5/debian/patches/series trunk/packages/gdcm/tags/2.0.10-5/debian/rules Log: completely redo the libgdcm-cil stuff Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/changelog =================================================================== --- trunk/packages/gdcm/tags/2.0.10-5/debian/changelog 2009-06-22 15:47:07 UTC (rev 3524) +++ trunk/packages/gdcm/tags/2.0.10-5/debian/changelog 2009-06-22 17:03:28 UTC (rev 3525) @@ -1,3 +1,11 @@ +gdcm (2.0.10-5) unstable; urgency=low + + * Fix python-policy: python-support (>= 0.5.3) + * Fix cli-policy: cli-common-dev (>= 0.4.4) (copied from gmime2.4) + * Handle "Mono Architecture" [!alpha !m68k !hppa] + + -- Mathieu Malaterre <[email protected]> Mon, 22 Jun 2009 17:57:18 +0200 + gdcm (2.0.10-4) unstable; urgency=low * Adding another patch for gcc 4.4. Closes: #529276 Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/control =================================================================== --- trunk/packages/gdcm/tags/2.0.10-5/debian/control 2009-06-22 15:47:07 UTC (rev 3524) +++ trunk/packages/gdcm/tags/2.0.10-5/debian/control 2009-06-22 17:03:28 UTC (rev 3525) @@ -8,10 +8,12 @@ Steve M. Robbins <[email protected]> XS-Python-Version: current Build-Depends: debhelper (>= 5.0.37.2), python-dev, quilt, - python-support (>= 0.3.9), uuid-dev, zlib1g-dev, libexpat1-dev, + python-support (>= 0.5.3), uuid-dev, zlib1g-dev, libexpat1-dev, swig, cmake, libvtk5-dev (>= 5.2.1-4), python-vtk, libpng12-dev | libpng-dev, libjpeg62-dev, libtiff4-dev, libfreetype6-dev, libopenjpeg-dev, - libxext-dev, libxss-dev, libxft-dev, mono-devel (>= 2.0.1) + libxext-dev, libxss-dev, libxft-dev +Build-Depends-Indep: cli-common-dev (>= 0.5.7), + mono-devel (>= 2.0) | mono-mcs (>= 1.0) | mono-gmcs (>= 1.1.8) Standards-Version: 3.8.1 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gdcm/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdcm/trunk/ @@ -20,7 +22,6 @@ Package: libgdcm2.0 Architecture: any Depends: ${shlibs:Depends} -Suggests: dcmtk Description: Grassroots DICOM runtime libraries Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -33,6 +34,7 @@ Architecture: any Section: utils Depends: ${shlibs:Depends} +Suggests: dcmtk Description: Grassroots DICOM tools and utilities Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -70,7 +72,7 @@ Package: libgdcm-cil Section: cli-mono Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 -Depends: ${shlibs:Depends}, ${cli:Depends}, libgdcm2.0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${cli:Depends} Description: Grassroots DICOM CLI bindings Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports @@ -82,7 +84,7 @@ Package: python-gdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, libgdcm2.0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Grassroots DICOM Python bindings @@ -95,7 +97,6 @@ Package: libvtkgdcm2.0 Architecture: any Depends: ${shlibs:Depends} -Recommends: dcmtk Description: Grassroots DICOM VTK runtime libraries Grassroots DiCoM is a C++ library for DICOM medical files. It is automatically wrapped to python/C#/Java (using swig). It supports Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/libgdcm-cil.install =================================================================== --- trunk/packages/gdcm/tags/2.0.10-5/debian/libgdcm-cil.install 2009-06-22 15:47:07 UTC (rev 3524) +++ trunk/packages/gdcm/tags/2.0.10-5/debian/libgdcm-cil.install 2009-06-22 17:03:28 UTC (rev 3525) @@ -1,2 +1,2 @@ -usr/lib/libgdcm-cil/*.dll -usr/lib/libgdcm-cil/libgdcm.so +usr/lib/gdcm-2.*/*.dll usr/lib/libgdcm-cil +usr/lib/gdcm-2.*/libgdcm.so usr/lib/libgdcm-cil Added: trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch =================================================================== --- trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch (rev 0) +++ trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch 2009-06-22 17:03:28 UTC (rev 3525) @@ -0,0 +1,12 @@ +--- gdcm-2.0.10.orig/CMake/FindMONO.cmake (revision 5851) ++++ gdcm-2.0.10/CMake/FindMONO.cmake (working copy) +@@ -42,6 +42,9 @@ + # TODO get version + # TODO: there are multiple 'mcs' command on unix, need to check this is Mono: + # mcs --version should return "Mono C# compiler version 1.9.1.0" ++ELSEIF(MONO_EXECUTABLE AND GMCS_EXECUTABLE) ++SET(MCS_EXECUTABLE ${GMCS_EXECUTABLE}) ++SET(MONO_FOUND TRUE) + ENDIF(MONO_EXECUTABLE AND MCS_EXECUTABLE) + + IF(NOT MONO_FOUND) Property changes on: trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/patches/series =================================================================== --- trunk/packages/gdcm/tags/2.0.10-5/debian/patches/series 2009-06-22 15:47:07 UTC (rev 3524) +++ trunk/packages/gdcm/tags/2.0.10-5/debian/patches/series 2009-06-22 17:03:28 UTC (rev 3525) @@ -3,3 +3,4 @@ gdcm210_tagbackport.patch gdcm210_branchbackport.patch gcc44.patch +mono.patch Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/rules =================================================================== --- trunk/packages/gdcm/tags/2.0.10-5/debian/rules 2009-06-22 15:47:07 UTC (rev 3524) +++ trunk/packages/gdcm/tags/2.0.10-5/debian/rules 2009-06-22 17:03:28 UTC (rev 3525) @@ -17,12 +17,16 @@ export DH_OPTIONS # Debian CLI Policy �4.3 [0] +# -include /usr/share/cli-common/cli.make export MONO_DISABLE_SHM=1 + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) CFLAGS = -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -32,6 +36,15 @@ endif export CFLAGS +# Mono architectures: +# Mono is not available for all Debian architectures. It supports all except: +# m68k, hppa and alpha. +DEB_WRAP_CSHARP = 1 +ifneq (,$(filter m68k alpha hppa ,$(DEB_BUILD_ARCH))) + DEB_WRAP_CSHARP = 0 +endif + + # set the number of build jobs ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -57,8 +70,7 @@ -DGDCM_BUILD_APPLICATIONS=ON \ -DGDCM_BUILD_SHARED_LIBS=ON \ -DGDCM_WRAP_PYTHON=ON \ - -DGDCM_WRAP_CSHARP=ON \ - -DMCS_EXECUTABLE:FILEPATH=/usr/bin/gmcs \ + -DGDCM_WRAP_CSHARP=$(DEB_WRAP_CSHARP) \ -DGDCM_BUILD_TESTING:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \ @@ -102,8 +114,8 @@ mv $(TARGET)/usr/lib/python $(TARGET)/$(PYMODDIR) # correct location of libgdcm-cil files - cd $(TARGET)/usr/lib && mkdir libgdcm-cil - cd $(TARGET)/usr/lib && mv gdcm-*/*.dll gdcm-*/libgdcm.so libgdcm-cil + #cd $(TARGET)/usr/lib && mkdir libgdcm-cil + #cd $(TARGET)/usr/lib && mv gdcm-*/*.dll gdcm-*/libgdcm.so libgdcm-cil # This single target is used to build all the packages, all at once, or # one at a time. So keep in mind: any options passed to commands here will @@ -133,6 +145,7 @@ dh_fixperms # dh_perl dh_pysupport + dh_makeclilibs dh_makeshlibs -Xformats -V dh_installdeb dh_shlibdeps
_______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
