[med-svn] [gdcm] 01/05: Update patch to use new VTK perl scripts

[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 d96d776709c661154e2f27439a6dd5daede79fb9
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Fri Feb 19 15:02:19 2016 +0000

    Update patch to use new VTK perl scripts
    
    Update changelog
    
    Correct changelog descroption
---
 debian/changelog                   |  6 ++++++
 debian/patches/03_linkvtkdoc.patch | 30 +++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8605b56..bbfd1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdcm (2.6.3-2) UNRELEASED; urgency=medium
+
+  * [8885b5] d/p/03: Update patch to use new VTK perl scripts
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Fri, 19 Feb 2016 15:03:02 +0000
+
 gdcm (2.6.3-1) unstable; urgency=medium
 
   * New upstream version 
diff --git a/debian/patches/03_linkvtkdoc.patch b/debian/patches/03_linkvtkdoc.patch
index 2609148..f18e721 100644
--- a/debian/patches/03_linkvtkdoc.patch
+++ b/debian/patches/03_linkvtkdoc.patch
@@ -17,7 +17,23 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
    set(DOCUMENTATION_HTML_TARZ ON)
    set(DOXYGEN_PROJECT_NAME "vtkgdcm")
    if(VTK_SOURCE_DIR)
-@@ -95,7 +95,7 @@
+@@ -31,12 +31,10 @@
+   set(DOXYGEN_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/Doxygen")
+   else()
+       # sudo apt-get install vtk-doc
+-  if(EXISTS "/usr/share/doc/vtk-doc/html")
+-  set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html")
+-  elseif(EXISTS "/usr/share/doc/vtk6-doc/doxygen")
+-  set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen")
++  if(EXISTS "/usr/share/vtk-6.2/doxygen")
++  set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-6.2/doxygen")
+   else()
+-  message(WARNING "DOXYGEN_SOURCE_DIR need to be set.")
++  message("DOXYGEN_SOURCE_DIR need to be set.")
+   endif()
+   endif()
+   set(DOXYGEN_PROJECT_SOURCE_DIR "${vtkgdcm_SOURCE_DIR}")
+@@ -95,7 +93,7 @@
      get_filename_component(DOT_PATH ${DOT} PATH)
    endif()
  
@@ -26,7 +42,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
    if(INCLUDE_QT_DOCUMENTATION)
      set (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
    endif()
-@@ -109,7 +109,7 @@
+@@ -109,7 +107,7 @@
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
  
    add_custom_target(${DOXYGEN_PROJECT_NAME}DoxygenDoc
@@ -42,13 +58,13 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
  echo "Convert the VTK headers to the Doxygen format."
  if test "x$PERL_PROG" != "xNOTFOUND" ; then
 -    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
-+    gzip -cd "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" | $PERL_PROG - \
++    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl"  \
          --to "$INTERMEDIATE_DOX_DIR" \
          --relativeto "@DOXYGEN_SOURCE_LOCATIONS_DIR@" \
          @DOXYGEN_SOURCE_LOCATIONS@ || echoexit "Problem converting VTK headers"
      if test "x at DOXYGEN_BINARY_LOCATIONS_DIR@" != "x"; then
 -      $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
-+    gzip -cd "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" | $PERL_PROG - \
++    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" \
          --to "$INTERMEDIATE_DOX_DIR" \
          --relativeto "@DOXYGEN_BINARY_LOCATIONS_DIR@" \
          @DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem converting VTK headers"
@@ -57,9 +73,9 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
  echo "Build the full-text index."
  if test "x$PERL_PROG" != "xNOTFOUND" ; then
 -    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl" \
-+    gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop.gz" > doc_index.stop
++   cp "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop" doc_index.stop
 +
-+    gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl.gz" | $PERL_PROG - \
++    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl.gz" \
          --project "$PROJECT_NAME" \
 -        --stop  "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop" \
 +        --stop  "doc_index.stop" \
@@ -85,7 +101,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
  
  if test "x$PERL_PROG" != "xNOTFOUND" ; then
 -    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl" \
-+    gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl.gz" | $PERL_PROG - \
++    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl.gz" \
          --to "$INTERMEDIATE_DOX_DIR" \
          --html "$OUTPUT_DIRECTORY/html" || echoexit "Problem cleaning HTML pages"
  fi

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