Author: smr Date: 2009-04-10 22:05:00 +0000 (Fri, 10 Apr 2009) New Revision: 3280
Added: trunk/packages/gdcm/trunk/debian/libgdcm2.0.install trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch Removed: trunk/packages/gdcm/trunk/debian/libgdcm2.install trunk/packages/gdcm/trunk/debian/libvtkgdcm-dev.install trunk/packages/gdcm/trunk/debian/libvtkgdcm.install Modified: trunk/packages/gdcm/trunk/debian/control trunk/packages/gdcm/trunk/debian/csharp-gdcm.install trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install trunk/packages/gdcm/trunk/debian/patches/series trunk/packages/gdcm/trunk/debian/rules Log: Tweaked package names and descriptions. Fixed install of CLI components. Now builds with no fatal lintian errors. Modified: trunk/packages/gdcm/trunk/debian/control =================================================================== --- trunk/packages/gdcm/trunk/debian/control 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/control 2009-04-10 22:05:00 UTC (rev 3280) @@ -17,24 +17,29 @@ Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdcm/trunk/ Homepage: http://gdcm.sourceforge.net/ -Package: libgdcm2 +Package: libgdcm2.0 Architecture: any Depends: ${shlibs:Depends} Recommends: dcmtk -Description: DICOM library +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 RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. It also comes with DICOM Part 3,6 & 7 of the standard as XML files. + . + This package contains the libraries needed to run GDCM applications. Package: libgdcm-tools Architecture: any Section: utils Suggests: dicom3tools, pvrg Depends: ${shlibs:Depends} -Description: Command line utilities for libgdcm - Libgdcm provides a number of command line debugging and utility - programs. Install this package for the gdcmdump, gdcmconv, gdcmimg, +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 + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . + Install this package for the gdcmdump, gdcmconv, gdcmimg, gdcmscanner, gdcminfo, gdcmraw programs. Package: libgdcm2-dev @@ -42,50 +47,74 @@ Provides: libgdcm-dev Conflicts: libgdcm-dev Architecture: any -Depends: libgdcm2 (= ${binary:Version}) -Description: Headers and static libraries for libgdcm +Depends: libgdcm2.0 (= ${binary:Version}) +Description: Grassroots DICOM development libraries and headers + Grassroots DiCoM is a C++ library for DICOM medical files. It is + automatically wrapped to python/C#/Java (using swig). It supports + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Headers and static libraries for libgdcm. These are not needed to use gdcm, but are needed to build plugins or programs that link against libgdcm. -Package: libgdcm2-dbg +Package: libgdcm2.0-dbg Architecture: any -Priority: extra -Depends: libgdcm2 (= ${binary:Version}) -Description: Debug symbols for libgdcm2 +Section: debug +Depends: libgdcm2.0 (= ${binary:Version}) +Description: Grassroots DICOM runtime libraries, debug version + Grassroots DiCoM is a C++ library for DICOM medical files. It is + automatically wrapped to python/C#/Java (using swig). It supports + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Debug symbols for libgdcm that will allow useful tracebacks and debugging on end user machines. Package: csharp-gdcm Architecture: any -Depends: ${shlibs:Depends}, ${cli:Depends}, libgdcm2 (= ${binary:Version}) -Description: CLI bindings to the gdcm DICOM library +Depends: ${shlibs:Depends}, ${cli:Depends}, libgdcm2.0 (= ${binary:Version}) +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 + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . CLI bindings to the gdcm DICOM library. Package: python-gdcm Section: python Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, libgdcm2 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${python:Depends}, libgdcm2.0 (= ${binary:Version}) Provides: ${python:Provides} XB-Python-Version: ${python:Versions} -Description: Python bindings to the gdcm DICOM library +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 + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Python bindings to the gdcm DICOM library. -Package: libvtkgdcm +Package: libvtkgdcm2.0 Architecture: any Depends: ${shlibs:Depends}, libvtk5 Recommends: dcmtk -Description: DICOM library +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 + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Libvtkgdcm is a library that quickly allow programmer to use GDCM from a VTK environment. -Package: libvtkgdcm-dev +Package: libvtkgdcm2-dev Section: libdevel Provides: libvtkgdcm-dev Conflicts: libvtkgdcm-dev Architecture: any -Depends: libgdcm2 (= ${binary:Version}) -Description: Headers and static libraries for libvtkgdcm +Depends: libvtkgdcm2.0 (= ${binary:Version}) +Description: Grassroots DICOM VTK development libraries and headers + Grassroots DiCoM is a C++ library for DICOM medical files. It is + automatically wrapped to python/C#/Java (using swig). It supports + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Headers and static libraries for libvtkgdcm. These are not needed to use gdcm, but are needed to build plugins or programs that link against libvtkgdcm. @@ -96,14 +125,21 @@ Depends: ${shlibs:Depends}, ${python:Depends}, libgdcm2 (= ${binary:Version}) Provides: ${python:Provides} XB-Python-Version: ${python:Versions} -Description: Python bindings to the gdcm DICOM library +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 + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Python bindings to the gdcm DICOM library. Package: libvtkgdcm-tools Architecture: any Section: utils Depends: ${shlibs:Depends} -Description: Command line utilities for libvtkgdcm +Description: Grassroots DICOM VTK 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 + RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. + . Libvtkgdcm provides a number of command line debugging and utility programs. Install this package for the gdcmviewer programs. - Modified: trunk/packages/gdcm/trunk/debian/csharp-gdcm.install =================================================================== --- trunk/packages/gdcm/trunk/debian/csharp-gdcm.install 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/csharp-gdcm.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -1,2 +1,2 @@ -usr/lib/gdcm_csharp.dll -usr/lib/libgdcm.so +usr/lib/gdcm-*/gdcm_csharp.dll +usr/lib/gdcm-*/libgdcm.so Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -1,5 +1,5 @@ usr/lib/libgdcm*.so -usr/lib/gdcm-2.*/* +usr/lib/gdcm-2.*/*.cmake usr/include/gdcm-2.*/gdcm* usr/include/gdcm-2.*/zip* usr/include/gdcm-2.*/12/* Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.0.install (from rev 3279, trunk/packages/gdcm/trunk/debian/libgdcm2.install) =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm2.0.install (rev 0) +++ trunk/packages/gdcm/trunk/debian/libgdcm2.0.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -0,0 +1 @@ +usr/lib/libgdcm*.so.* Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm2.install 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/libgdcm2.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -1 +0,0 @@ -usr/lib/libgdcm*.so.* Deleted: trunk/packages/gdcm/trunk/debian/libvtkgdcm-dev.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm-dev.install 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-dev.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -1,2 +0,0 @@ -usr/lib/libvtkgdcm*.so -usr/include/gdcm-2.*/vtk* Deleted: trunk/packages/gdcm/trunk/debian/libvtkgdcm.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm.install 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -1 +0,0 @@ -usr/lib/libvtkgdcm*.so.* Copied: trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install (from rev 3279, trunk/packages/gdcm/trunk/debian/libvtkgdcm-dev.install) =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install (rev 0) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -0,0 +1,2 @@ +usr/lib/libvtkgdcm*.so +usr/include/gdcm-2.*/vtk* Copied: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install (from rev 3279, trunk/packages/gdcm/trunk/debian/libvtkgdcm.install) =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install (rev 0) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install 2009-04-10 22:05:00 UTC (rev 3280) @@ -0,0 +1 @@ +usr/lib/libvtkgdcm*.so.* Added: trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/csharp-install.patch 2009-04-10 22:05:00 UTC (rev 3280) @@ -0,0 +1,44 @@ +--- gdcm-2.0.10.orig/Wrapping/Csharp/CMakeLists.txt ++++ gdcm-2.0.10/Wrapping/Csharp/CMakeLists.txt +@@ -41,22 +41,6 @@ + SET_TARGET_PROPERTIES(${SWIG_MODULE_gdcm_REAL_NAME} PROPERTIES PREFIX "lib") + ENDIF(UNIX) + +- +-#Module are always place in the library destination +-#but for poor win32 user I decided to place them +-# right next to the other dlls +-IF(NOT GDCM_INSTALL_NO_LIBRARIES) +- INSTALL(TARGETS ${SWIG_MODULE_gdcm_REAL_NAME} +- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime +- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime +- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development +- ${CPACK_NAMELINK_TYPE} +- ) +- +-ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES) +- +- +- + ##IF(UNIX) + ## FIND_PACKAGE(MONO REQUIRED) + #FIND_PACKAGE(CSharp REQUIRED) +@@ -171,14 +155,14 @@ + + IF(NOT GDCM_INSTALL_NO_LIBRARIES) + INSTALL(TARGETS ${SWIG_MODULE_gdcm_REAL_NAME} +- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Runtime +- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime +- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ++ RUNTIME DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Runtime ++ LIBRARY DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Runtime ++ ARCHIVE DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Development + ${CPACK_NAMELINK_TYPE} + ) + # because gdcm_csharp.dll is constructed with custom commands, it need the INSTALL(FILES signature: + INSTALL(FILES ${GDCM_LIBRARY_DIR}/gdcm_csharp.dll +- DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Runtime ++ DESTINATION ${GDCM_INSTALL_PACKAGE_DIR} COMPONENT Runtime + ) + ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES) + Added: trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/gdcmjpeg-versioning.patch 2009-04-10 22:05:00 UTC (rev 3280) @@ -0,0 +1,22 @@ +--- gdcm-2.0.10.orig/Utilities/gdcmjpeg/CMakeLists.txt ++++ gdcm-2.0.10/Utilities/gdcmjpeg/CMakeLists.txt +@@ -19,17 +19,9 @@ + # Do full dependency headers. + INCLUDE_REGULAR_EXPRESSION("^.*$") + +-#----------------------------------------------------------------------------- +-# IJG version number, usefull for packaging and doxygen doc: +-SET(JPEG_MAJOR_VERSION 62) # 62 number version comes from the debian shared lib: /usr/lib/libjpeg.so.62 +-SET(JPEG_MINOR_VERSION 1) # bump up the minor version number so that there is no collision +-SET(JPEG_BUILD_VERSION 0) +-SET(JPEG_VERSION +- "${JPEG_MAJOR_VERSION}.${JPEG_MINOR_VERSION}.${JPEG_BUILD_VERSION}") +- + SET(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES} +- VERSION "${JPEG_VERSION}" +- SOVERSION "${JPEG_MAJOR_VERSION}.${JPEG_MINOR_VERSION}" ++ VERSION "${GDCM_VERSION}" ++ SOVERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}" + ) + + Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/patches/series 2009-04-10 22:05:00 UTC (rev 3280) @@ -0,0 +1,2 @@ +csharp-install.patch +gdcmjpeg-versioning.patch Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2009-04-09 02:04:13 UTC (rev 3279) +++ trunk/packages/gdcm/trunk/debian/rules 2009-04-10 22:05:00 UTC (rev 3280) @@ -116,7 +116,7 @@ # dh_installcron # dh_installinfo dh_install --sourcedir=$(TARGET) --fail-missing - dh_strip --dbg-package=libgdcm2-dbg + dh_strip --dbg-package=libgdcm2.0-dbg dh_link dh_compress dh_fixperms _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
