[med-svn] r10733 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon May 7 14:40:38 UTC 2012
Author: malat
Date: 2012-05-07 14:40:37 +0000 (Mon, 07 May 2012)
New Revision: 10733
Added:
trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.html
trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf
trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch
trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.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:
Add gdcm-doc package
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2012-05-07 13:39:56 UTC (rev 10732)
+++ trunk/packages/gdcm/trunk/debian/changelog 2012-05-07 14:40:37 UTC (rev 10733)
@@ -3,6 +3,7 @@
* Remove SONAME from python module, as per policy
* Build PHP5 bindings
* Fix issue with python 3.2 vs 2.7
+ * Adding a gdcm-doc package
-- Mathieu Malaterre <malat at debian.org> Mon, 07 May 2012 11:34:03 +0200
Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control 2012-05-07 13:39:56 UTC (rev 10732)
+++ trunk/packages/gdcm/trunk/debian/control 2012-05-07 14:40:37 UTC (rev 10733)
@@ -14,6 +14,7 @@
mummy [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
cli-common-dev (>= 0.8~) [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
mono-devel (>= 2.10.5) [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc]
+Build-Depends-Indep: vtk-doc
Standards-Version: 3.9.3
X-Python-Version: 2.7
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/
@@ -209,3 +210,14 @@
Libvtkgdcm-tools provides a number of command line debugging and utility
tool. Install this package for the gdcmviewer, gdcm2pnm and gdcm2vtk
programs.
+
+Package: gdcm-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, vtk-doc, doc-base
+Description: Grassroots DICOM documentation
+ 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.
+ .
+ This is the documentation for gdcm and vtkgdcm
Added: trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.html
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.html (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.html 2012-05-07 14:40:37 UTC (rev 10733)
@@ -0,0 +1,9 @@
+Document: gdcm-doc-html
+Title: GDCM User's Guide HTML
+Author: Mathieu Malaterre
+Abstract: Doxygen documentation of GDCM as HTML format
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/gdcm-doc/html/index.html
+Files: /usr/share/doc/gdcm-doc/html/*
Added: trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf 2012-05-07 14:40:37 UTC (rev 10733)
@@ -0,0 +1,8 @@
+Document: gdcm-doc-pdf
+Title: GDCM User's Guide PDF
+Author: Mathieu Malaterre
+Abstract: Doxygen documentation of GDCM as PDF format
+Section: Programming/C++
+
+Format: PDF
+Index: /usr/share/doc/gdcm-2.2/gdcm-2.2.0.pdf
Added: trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.docs (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2012-05-07 14:40:37 UTC (rev 10733)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/gdcm-*/html/
+debian/tmp/usr/share/doc/gdcm-*/gdcm-2.2.0.pdf
Added: trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch 2012-05-07 14:40:37 UTC (rev 10733)
@@ -0,0 +1,174 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gdcm (2.2.0-11) UNRELEASED; urgency=low
+ .
+ * Remove SONAME from python module, as per policy
+ * Build PHP5 bindings
+ * Fix issue with python 3.2 vs 2.7
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ gdcm-2.2.0/Utilities/VTK/vtkGDCMImageReader_Extra.cs
+@@ -0,0 +1,28 @@
++/*=========================================================================
++
++ Program: GDCM (Grassroots DICOM). A DICOM library
++
++ Copyright (c) 2006-2011 Mathieu Malaterre
++ All rights reserved.
++ See Copyright.txt or http://gdcm.sourceforge.net/Copyright.html for details.
++
++ This software is distributed WITHOUT ANY WARRANTY; without even
++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++ PURPOSE. See the above copyright notice for more information.
++
++=========================================================================*/
++
++namespace Kitware.VTK.GDCM
++{
++public class vtkgdcm {
++// FIXME why isn't mummy doing it ?
++ public static readonly int VTK_LUMINANCE = 1;
++ public static readonly int VTK_LUMINANCE_ALPHA = 2;
++ public static readonly int VTK_RGB = 3;
++ public static readonly int VTK_RGBA = 4;
++ public static readonly int VTK_INVERSE_LUMINANCE = 5;
++ public static readonly int VTK_LOOKUP_TABLE = 6;
++ public static readonly int VTK_YBR = 7;
++ public static readonly int VTK_CMYK = 8;
++}
++}
+--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt
++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
+@@ -12,11 +12,11 @@ SET(vtkgdcm_SRCS
+ vtkGDCMMedicalImageProperties.cxx
+ )
+
+-IF(GDCM_HAVE_PTHREAD_H)
++IF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
+ SET(vtkgdcm_SRCS ${vtkgdcm_SRCS}
+ vtkGDCMThreadedImageReader.cxx
+ )
+-ENDIF(GDCM_HAVE_PTHREAD_H)
++ENDIF(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
+
+ INCLUDE(${VTK_USE_FILE})
+
+@@ -183,11 +183,13 @@ IF(GDCM_WRAP_PHP)
+
+ SWIG_ADD_MODULE(php_vtkgdcm php vtkgdcm.i)
+ SWIG_LINK_LIBRARIES(php_vtkgdcm vtkgdcm)
++ TARGET_LINK_LIBRARIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} ${vtkgdcm_LIBS})
+ IF(UNIX)
+- SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES OUTPUT_NAME "vtkgdcm")
++ SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES OUTPUT_NAME "vtkgdcm")
+ ENDIF(UNIX)
+ SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES PREFIX "")
+ SET_TARGET_PROPERTIES(${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
++ set_property(TARGET ${SWIG_MODULE_php_vtkgdcm_REAL_NAME} PROPERTY NO_SONAME 1)
+
+ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ INSTALL(TARGETS ${SWIG_MODULE_php_vtkgdcm_REAL_NAME}
+@@ -203,11 +205,13 @@ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ # endif(NAMELINK_ONLY)
+
+ # See gdcm bug #3175803
++if(${SWIG_VERSION} LESS 2.0.2)
+ add_custom_command(TARGET ${SWIG_MODULE_php_vtkgdcm_REAL_NAME}
+ PRE_BUILD
+ COMMAND sed -i -e 's/zend_error_noreturn/zend_error/g' "${swig_generated_file_fullname}"
+ COMMENT "Patching zend_error_noreturn into zend_error"
+ )
++endif()
+
+ # Let's copy vtkgdcm.php into the bin dir:
+ ADD_CUSTOM_COMMAND(
+@@ -220,6 +224,9 @@ ADD_CUSTOM_TARGET(VTKGDCMPHP ALL
+ DEPENDS ${LIBRARY_OUTPUT_PATH}/vtkgdcm.php
+ COMMENT "building vtkgdcm.php"
+ )
++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/vtkgdcm.php
++ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKPythonModule
++ )
+
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ ENDIF(GDCM_WRAP_PHP)
+@@ -266,6 +273,7 @@ IF(GDCM_WRAP_CSHARP)
+
+ IF(GDCM_USE_ACTIVIZ)
+ FIND_PACKAGE(Mummy REQUIRED)
++ MARK_AS_ADVANCED(Mummy_DIR)
+ IF(NOT Mummy_BASE_DIR)
+ MESSAGE(FATAL_ERROR "error: Mummy_BASE_DIR not defined. Please set Mummy_DIR to the directory containing MummyConfig.cmake")
+ ENDIF(NOT Mummy_BASE_DIR)
+@@ -273,6 +281,7 @@ IF(GDCM_WRAP_CSHARP)
+ IF(NOT mummy_EXECUTABLE)
+ FIND_PROGRAM(mummy_EXECUTABLE mummy)
+ ENDIF(NOT mummy_EXECUTABLE)
++ MARK_AS_ADVANCED(mummy_EXECUTABLE)
+ IF(NOT mummy_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
+ ENDIF(NOT mummy_EXECUTABLE)
+@@ -280,6 +289,7 @@ IF(GDCM_WRAP_CSHARP)
+ IF(NOT gccxml_EXECUTABLE)
+ FIND_PROGRAM(gccxml_EXECUTABLE gccxml)
+ ENDIF(NOT gccxml_EXECUTABLE)
++ MARK_AS_ADVANCED(gccxml_EXECUTABLE)
+ IF(NOT gccxml_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
+ ENDIF(NOT gccxml_EXECUTABLE)
+@@ -471,6 +481,7 @@ IF(GDCM_WRAP_CSHARP)
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtk${kit})
+ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtkCommon)
++ set_property(TARGET Kitware.VTK.vtk${kit}.Unmanaged PROPERTY NO_SONAME 1)
+ # 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")
+@@ -506,6 +517,7 @@ IF(GDCM_WRAP_CSHARP)
+ SET(ALLKITS_CS_SOURCES
+ ${ALLKITS_CS_SOURCES}
+ "${CMAKE_CURRENT_BINARY_DIR}/csharp/AssemblyInfo.cs"
++ ${CMAKE_CURRENT_SOURCE_DIR}/vtkGDCMImageReader_Extra.cs
+ )
+
+ SET(AVDN_VTK_CSC_REFS ${ACTIVIZ_KITWARE_VTK_LIBRARY} ${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY})
+@@ -689,9 +701,9 @@ IF(GDCM_WRAP_PYTHON)
+ # do not set the version on the Python module:
+ #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
+ ADD_LIBRARY(${VTKGDCM_NAME}Python MODULE ${VTKGDCM_NAME}PythonInit.cxx)
+- # do not set the version on the PythonD module:
++ # do not set the version on the Python module:
+ SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
+- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME})
++ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARIES})
+ FOREACH(c ${vtkgdcm_LIBS} vtkFiltering)
+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
+ ENDFOREACH(c)
+@@ -699,6 +711,8 @@ IF(GDCM_WRAP_PYTHON)
+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD vtkPythonCore)
+ endif()
+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Python ${VTKGDCM_NAME}PythonD)
++ set_property(TARGET ${VTKGDCM_NAME}Python PROPERTY NO_SONAME 1)
++ #set_property(TARGET ${VTKGDCM_NAME}PythonD PROPERTY NO_SONAME 1)
+ # Python extension modules on Windows must have the extension ".pyd"
+ # instead of ".dll" as of Python 2.5. Older python versions do support
+ # this suffix.
Added: trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch 2012-05-07 14:40:37 UTC (rev 10733)
@@ -0,0 +1,45 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gdcm (2.2.0-11) UNRELEASED; urgency=low
+ .
+ * Remove SONAME from python module, as per policy
+ * Build PHP5 bindings
+ * Fix issue with python 3.2 vs 2.7
+ * Adding a gdcm-doc package
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- gdcm-2.2.0.orig/Utilities/doxygen/CMakeLists.txt
++++ gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt
+@@ -186,6 +186,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/latex/Makefi
+ ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmviewer.1
+ DESTINATION ${GDCM_INSTALL_MAN_DIR}/man1 COMPONENT Development
+ )
++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${GDCM_INSTALL_DOC_DIR}
++ PATTERN "*.md5" EXCLUDE
++ PATTERN "*.dot" EXCLUDE
++ )
++ INSTALL(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf
++ DESTINATION ${GDCM_INSTALL_DOC_DIR}
++ )
+
+ # http://lists.debian.org/debian-italian/2006/12/msg00878.html
+ # man2txt : man man | col -b | less
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 13:39:56 UTC (rev 10732)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 14:40:37 UTC (rev 10733)
@@ -11,3 +11,5 @@
fixundef.patch
removesonamepython.patch
sonameprops.patch
+csharpfixes.patch
+fixdoxygeninstall.patch
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2012-05-07 13:39:56 UTC (rev 10732)
+++ trunk/packages/gdcm/trunk/debian/rules 2012-05-07 14:40:37 UTC (rev 10733)
@@ -28,19 +28,28 @@
endif
export LD_LIBRARY_PATH
+# deduce documentation option (build-indep target)
+ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
+ BUILDDOC = OFF
+else
+ BUILDDOC = ON
+endif
+
%:
dh $@ $(WITH_CLI) --with python2 --with javahelper --parallel
PYVER := $(shell pyversions -dv)
PYMODDIR := /usr/lib/$(shell pyversions -r)
+# GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target)
# Need to make sure to build using the same vtk/python version:
CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DGDCM_NO_EXECUTABLE_PROPERTIES=ON \
-DGDCM_BUILD_APPLICATIONS=ON \
-DGDCM_DOCUMENTATION:BOOL=ON \
- -DGDCM_PDF_DOCUMENTATION:BOOL=ON \
+ -DGDCM_VTK_DOCUMENTATION:BOOL=$(BUILDDOC) \
+ -DGDCM_PDF_DOCUMENTATION:BOOL=$(BUILDDOC) \
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
@@ -66,7 +75,7 @@
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-override_dh_install:
+override_dh_install-arch:
dh_install --list-missing
override_dh_auto_install:
@@ -92,6 +101,19 @@
dh_clideps
endif
+# Let's be smart with building doc
+override_dh_auto_build-indep:
+ -$(MAKE) -C obj-* vtkgdcmDoxygenDoc
+
+# No tests needed for docs
+override_dh_auto_test-indep:
+
+pkg_doc = gdcm-doc
+pkg_exa = gdcm-examples
+
+override_dh_install-indep:
+ dh_compress -X.map -X.pdf
+
# TODO I cannot set documentation to separate build target as man page
# depends on doc, and bin tools depends on man page
#build-indep:
More information about the debian-med-commit
mailing list