[med-svn] [gdcm] 04/09: Update vtk-docu patch

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository gdcm.

commit 10223c22a53de149b9fa01d0d8b3e57367393f52
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sat Jan 30 21:11:36 2016 +0100

    Update vtk-docu patch
---
 debian/patches/03_linkvtkdoc.patch | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/debian/patches/03_linkvtkdoc.patch b/debian/patches/03_linkvtkdoc.patch
index d2beb48..2609148 100644
--- a/debian/patches/03_linkvtkdoc.patch
+++ b/debian/patches/03_linkvtkdoc.patch
@@ -6,9 +6,8 @@ Description: Correct use of scripts from vtk6-doc
  Merged to one patch because they overlap partially. 
 Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
 
-diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt gdcm-2.6.0/Utilities/doxygen/vtk/CMakeLists.txt
---- gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/doxygen/vtk/CMakeLists.txt	2015-10-16 17:06:34.550679081 +0200
+--- a/Utilities/doxygen/vtk/CMakeLists.txt
++++ b/Utilities/doxygen/vtk/CMakeLists.txt
 @@ -22,7 +22,7 @@
      set (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
    endif ()
@@ -18,16 +17,7 @@ diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt gdcm-2.6.0/Utilitie
    set(DOCUMENTATION_HTML_TARZ ON)
    set(DOXYGEN_PROJECT_NAME "vtkgdcm")
    if(VTK_SOURCE_DIR)
-@@ -31,7 +31,7 @@
-   set(DOXYGEN_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/Doxygen")
-   else()
-       # sudo apt-get install vtk-doc
--  set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html/")
-+  set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen/")
-   endif()
-   set(DOXYGEN_PROJECT_SOURCE_DIR "${vtkgdcm_SOURCE_DIR}")
-   set(VTK_DOXYGEN_HOME "${vtkgdcm_SOURCE_DIR}/VTK/Utilities/Doxygen")
-@@ -89,7 +89,7 @@
+@@ -95,7 +95,7 @@
      get_filename_component(DOT_PATH ${DOT} PATH)
    endif()
  
@@ -36,7 +26,7 @@ diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt gdcm-2.6.0/Utilitie
    if(INCLUDE_QT_DOCUMENTATION)
      set (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
    endif()
-@@ -103,7 +103,7 @@
+@@ -109,7 +109,7 @@
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
  
    add_custom_target(${DOXYGEN_PROJECT_NAME}DoxygenDoc
@@ -45,9 +35,8 @@ diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt gdcm-2.6.0/Utilitie
      ${BASH}
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
  
-diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in gdcm-2.6.0/Utilities/doxygen/vtk/doc_makeall.sh.in
---- gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/doxygen/vtk/doc_makeall.sh.in	2015-10-16 17:20:10.811973984 +0200
+--- a/Utilities/doxygen/vtk/doc_makeall.sh.in
++++ b/Utilities/doxygen/vtk/doc_makeall.sh.in
 @@ -169,12 +169,12 @@
  # Convert the VTK headers to the Doxygen format.
  echo "Convert the VTK headers to the Doxygen format."
@@ -100,9 +89,8 @@ diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in gdcm-2.6.0/Utili
          --to "$INTERMEDIATE_DOX_DIR" \
          --html "$OUTPUT_DIRECTORY/html" || echoexit "Problem cleaning HTML pages"
  fi
-diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doxyfile.in gdcm-2.6.0/Utilities/doxygen/vtk/doxyfile.in
---- gdcm-2.6.0.old/Utilities/doxygen/vtk/doxyfile.in	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/doxygen/vtk/doxyfile.in	2015-10-16 16:32:10.000000000 +0200
+--- a/Utilities/doxygen/vtk/doxyfile.in
++++ b/Utilities/doxygen/vtk/doxyfile.in
 @@ -23,6 +23,7 @@
  HAVE_DOT             = YES
  #HAVE_DOT            = NO

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git