[paraview] 02/03: Install missing files in paraview-dev. (Closes: #783797)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository paraview.

commit 0065768f548e0dfd161d37b395bd7489ba21a526
Author: Anton Gladky <gladk at debian.org>
Date:   Tue May 5 19:14:51 2015 +0200

    Install missing files in paraview-dev. (Closes: #783797)
---
 debian/paraview-dev.install             |  4 +++-
 debian/patches/reduce_cmake_error.cmake | 34 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  2 ++
 debian/rules                            |  2 +-
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/debian/paraview-dev.install b/debian/paraview-dev.install
index e2b1f91..27ed25d 100644
--- a/debian/paraview-dev.install
+++ b/debian/paraview-dev.install
@@ -3,4 +3,6 @@ usr/lib/cmake/paraview/*.cmake
 usr/lib/cmake/paraview/*.in
 usr/lib/cmake/paraview/*.xsl
 usr/lib/cmake/paraview/*.cmake
-usr/bin/vtkWrapClientServer
+usr/bin/vtk*
+usr/lib/paraview/site-packages/vtk/*.so
+usr/lib/paraview/*.a
diff --git a/debian/patches/reduce_cmake_error.cmake b/debian/patches/reduce_cmake_error.cmake
new file mode 100644
index 0000000..b99ee3d
--- /dev/null
+++ b/debian/patches/reduce_cmake_error.cmake
@@ -0,0 +1,34 @@
+Description: Reduce the error message in cmake if module is missing
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/783797
+Last-Update: 2015-05-05
+
+Index: paraview-4.1.0+dfsg+1/VTK/CMake/vtkModuleAPI.cmake
+===================================================================
+--- paraview-4.1.0+dfsg+1.orig/VTK/CMake/vtkModuleAPI.cmake
++++ paraview-4.1.0+dfsg+1/VTK/CMake/vtkModuleAPI.cmake
+@@ -50,7 +50,7 @@ macro(vtk_module_load mod)
+       include(${mod} OPTIONAL)
+     endif()
+     if(NOT ${mod}_LOADED)
+-      message(FATAL_ERROR "No such module: \"${mod}\"")
++      message(STATUS "No such module: \"${mod}\"")
+     endif()
+   endif()
+ endmacro()
+@@ -110,14 +110,11 @@ endmacro()
+ macro(vtk_module_config ns)
+   set(_${ns}_MISSING ${ARGN})
+   if(_${ns}_MISSING)
+-    list(REMOVE_ITEM _${ns}_MISSING ${VTK_MODULES_ENABLED})
+-  endif()
+-  if(_${ns}_MISSING)
+     set(msg "")
+     foreach(mod ${_${ns}_MISSING})
+       set(msg "${msg}\n  ${mod}")
+     endforeach()
+-    message(FATAL_ERROR "Requested modules not available:${msg}")
++    message(STATUS "Requested modules not available:${msg}")
+   endif()
+ 
+   set(${ns}_DEFINITIONS "")
diff --git a/debian/patches/series b/debian/patches/series
index 16cdaa6..7eea230 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ fix_path_paraview.patch
 fix_FTBFS_KWSys.patch
 fix_ftbfs_gcc49.patch
 fix_GLintptr_FTBFS.patch
+fix_ftbfs_freetype.patch
+reduce_cmake_error.cmake
diff --git a/debian/rules b/debian/rules
index 76d39e7..6f9c6e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ extra_flags += -Wno-dev \
 	-DVTK_INSTALL_DATA_DIR="share/paraview" \
 	-DVTK_INSTALL_DOC_DIR="share/doc/paraview" \
 	-DVTK_INSTALL_PACKAGE_DIR="lib/cmake/paraview" \
-	-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
+	-DVTK_CUSTOM_LIBRARY_SUFFIX="-pv" \
 	-DVTK_USE_SYSTEM_TIFF=ON \
 	-DVTK_USE_SYSTEM_ZLIB=ON \
 	-DBUILD_EXAMPLES=OFF \

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