[med-svn] r10737 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-05-07 17:17:14 +0000 (Mon, 07 May 2012)
New Revision: 10737

Modified:
   trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf
   trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
   trunk/packages/gdcm/trunk/debian/rules
Log:
Fix incorrect installation path

Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf	2012-05-07 16:55:04 UTC (rev 10736)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base.pdf	2012-05-07 17:17:14 UTC (rev 10737)
@@ -5,4 +5,4 @@
 Section: Programming/C++
 
 Format: PDF
-Index: /usr/share/doc/gdcm-2.2/gdcm-2.2.0.pdf
+Files: /usr/share/doc/gdcm-doc/gdcm-2.2.0.pdf

Modified: trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch	2012-05-07 16:55:04 UTC (rev 10736)
+++ trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch	2012-05-07 17:17:14 UTC (rev 10737)
@@ -28,8 +28,8 @@
 
 Index: gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/doxygen/CMakeLists.txt	2012-05-07 16:49:21.791034990 +0000
-+++ gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt	2012-05-07 16:49:24.535034891 +0000
+--- gdcm-2.2.0.orig/Utilities/doxygen/CMakeLists.txt	2011-12-30 16:37:28.000000000 +0100
++++ gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt	2012-05-07 18:51:52.000000000 +0200
 @@ -186,6 +186,14 @@
      ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmviewer.1
      DESTINATION ${GDCM_INSTALL_MAN_DIR}/man1 COMPONENT Development
@@ -47,8 +47,17 @@
    # man2txt : man man | col -b | less
 Index: gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/doxygen/vtk/CMakeLists.txt	2012-05-07 16:49:21.791034990 +0000
-+++ gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt	2012-05-07 16:49:24.535034891 +0000
+--- gdcm-2.2.0.orig/Utilities/doxygen/vtk/CMakeLists.txt	2011-12-30 16:37:28.000000000 +0100
++++ gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt	2012-05-07 19:00:16.207011365 +0200
+@@ -22,7 +22,7 @@
+     SET (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
+   ENDIF (INCLUDE_QT_DOCUMENTATION)
+   SET(BUILD_DOXYGEN ON)
+-  SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE ON)
++  SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE OFF)
+   SET(DOCUMENTATION_HTML_TARZ ON)
+   SET(DOXYGEN_PROJECT_NAME "vtkgdcm")
+   if(VTK_SOURCE_DIR)
 @@ -103,7 +103,7 @@
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
  
@@ -60,8 +69,8 @@
  
 Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt	2012-05-07 16:49:17.563035143 +0000
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt	2012-05-07 16:49:24.535034891 +0000
+--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt	2012-05-07 18:51:52.000000000 +0200
++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt	2012-05-07 18:51:52.000000000 +0200
 @@ -699,10 +699,10 @@
      ADD_LIBRARY(${VTKGDCM_NAME}PythonD ${vtkgdcmPYTHON_SRCS})
      # this is a library set the version:

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2012-05-07 16:55:04 UTC (rev 10736)
+++ trunk/packages/gdcm/trunk/debian/rules	2012-05-07 17:17:14 UTC (rev 10737)
@@ -69,6 +69,7 @@
 		-DGDCM_USE_ACTIVIZ:BOOL=ON \
 		-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 \
 		-DGDCM_USE_VTK:BOOL=ON
 
 override_dh_auto_configure: