[clfft] 27/50: doc properly installed ?

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit c6bfbbdf1afcefa6271197ad30a46883d9f1c43b
Author: Jerome Kieffer <jerome.kieffer at esrf.fr>
Date:   Tue Apr 21 17:41:48 2015 +0200

    doc properly installed ?
---
 debian/libclfft2-doc.install | 2 +-
 debian/patches/docpath.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/libclfft2-doc.install b/debian/libclfft2-doc.install
index f40e504..6119b4c 100644
--- a/debian/libclfft2-doc.install
+++ b/debian/libclfft2-doc.install
@@ -1 +1 @@
-usr/share/doc/doc/html usr/share/doc/libclfft2-doc
+usr/share/doc/html usr/share/doc/libclfft2-doc
diff --git a/debian/patches/docpath.patch b/debian/patches/docpath.patch
index bc6e371..0b13cbe 100644
--- a/debian/patches/docpath.patch
+++ b/debian/patches/docpath.patch
@@ -2788,7 +2788,7 @@
 +  SET( doxyfile             ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile        )
 +  SET( doxy_html_index_file ${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html )
 +  SET( doxy_output_root     ${CMAKE_CURRENT_BINARY_DIR}/doc/html        ) 
-+  SET( doxy_input           ${PROJECT_SOURCE_DIR}/src                   ) 
++  file(GLOB doxy_images     ${PROJECT_SOURCE_DIR}/../doc/*.jpg          ) 
 +  CONFIGURE_FILE( ${doxyfile_in} ${doxyfile} @ONLY )
 + 
 +  ADD_CUSTOM_COMMAND( OUTPUT ${doxy_html_index_file}
@@ -2803,6 +2803,6 @@
 + 
 +  ADD_CUSTOM_TARGET( doc ALL DEPENDS ${doxy_html_index_file} )
 + 
-+  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share/doc )
-+  INSTALL( DIRECTORY ${PROJECT_SOURCE_DIR}/../doc DESTINATION share/doc/html )
++  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share )
++  INSTALL( FILES ${doxy_images} DESTINATION share/doc/html )
 +ENDIF()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git