Author: malat Date: 2012-05-07 17:42:46 +0000 (Mon, 07 May 2012) New Revision: 10738
Added: trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch Modified: trunk/packages/gdcm/trunk/debian/patches/series trunk/packages/gdcm/trunk/debian/rules Log: make sure to link to local doc Added: trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2012-05-07 17:42:46 UTC (rev 10738) @@ -0,0 +1,24 @@ +Description: link to vtk doc +Author: Mathieu Malaterre <ma...@debian.org> + +--- gdcm-2.2.0.orig/Utilities/doxygen/vtk/CMakeLists.txt ++++ gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt +@@ -89,7 +89,7 @@ MARK_AS_ADVANCED(VTK_DIR) + GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH) + ENDIF(NOT DOT_PATH) + +- SET(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"") ++ #SET(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"") + IF(INCLUDE_QT_DOCUMENTATION) + SET (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"") + ENDIF(INCLUDE_QT_DOCUMENTATION) +--- gdcm-2.2.0.orig/Utilities/doxygen/vtk/doxyfile.in ++++ gdcm-2.2.0/Utilities/doxygen/vtk/doxyfile.in +@@ -23,6 +23,7 @@ PDF_HYPERLINKS = YES + HAVE_DOT = YES + #HAVE_DOT = NO + DOT_PATH = "@DOT_PATH@" ++DOT_IMAGE_FORMAT = svg + CLASS_GRAPH = YES + COLLABORATION_GRAPH = YES + TEMPLATE_RELATIONS = YES Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 17:17:14 UTC (rev 10737) +++ trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 17:42:46 UTC (rev 10738) @@ -13,3 +13,4 @@ sonameprops.patch csharpfixes.patch fixdoxygeninstall.patch +linkvtkdoc.patch Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2012-05-07 17:17:14 UTC (rev 10737) +++ trunk/packages/gdcm/trunk/debian/rules 2012-05-07 17:42:46 UTC (rev 10738) @@ -38,6 +38,7 @@ PYVER := $(shell pyversions -dv) PYMODDIR := /usr/lib/$(shell pyversions -r) +VTKVERS=$(shell apt-cache policy libvtk5-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2) # GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target) # Need to make sure to build using the same vtk/python version: @@ -70,6 +71,7 @@ -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \ -DPYTHON_LIBRARY:FILEPATH=/usr/lib/python2.7/config/libpython2.7.so \ -DGDCM_INSTALL_DOC_DIR:STRING=share/doc/gdcm-doc \ + -DTAGFILES:STRING="/usr/share/doc/vtk-doc/html/vtk$(VTKVERS).tag=/usr/share/doc/vtk-doc/html/" \ -DGDCM_USE_VTK:BOOL=ON override_dh_auto_configure: _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit