[SCM] Paraview packaging branch, master, updated. debian/3.14.1-4-1-g4b21168

[Anton Gladky]

The following commit has been merged in the master branch:
commit 4b2116803da0477d63f69de2d7e756d11a51748c
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Jun 15 23:41:25 2012 +0200

    Fix installation of cmake-files. (Closes: #677492)

diff --git a/debian/patches/install_all_cmake_files.patch b/debian/patches/install_all_cmake_files.patch
new file mode 100644
index 0000000..f406335
--- /dev/null
+++ b/debian/patches/install_all_cmake_files.patch
@@ -0,0 +1,66 @@
+Description: CMake files were not being installed correctly.
+             Fixed install rule to install all files under the CMake 
+             directory to ensure that
+             new files don't get missed in the future.
+Author: Utkarsh Ayachit <utkarsh.ayachit at kitware.com>
+Applied-Upstream: http://paraview.org/gitweb?p=ParaView.git;a=commitdiff;h=801dbb6b2a1ddbb059e2311f83dc6723edaf18d8
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Bug: http://paraview.org/Bug/view.php?id=13065
+Bug-Debian: http://bugs.debian.org/677492
+Last-Update: 2012-06-15
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,48 +395,11 @@
+       DESTINATION ${PV_INSTALL_INCLUDE_DIR}
+       COMPONENT Development)
+ 
+-  SET(cmakeDevFiles
+-      ${ParaView_CMAKE_DIR}/branded_splash.png
+-      ${ParaView_SOURCE_DIR}/ParaViewUse.cmake
+-      ${ParaView_CMAKE_DIR}/ParaViewMacros.cmake
+-      ${ParaView_CMAKE_DIR}/ParaViewPlugins.cmake
+-      ${ParaView_CMAKE_DIR}/ParaViewBranding.cmake
+-      ${ParaView_CMAKE_DIR}/ParaViewBrandingCPack.cmake
+-      ${ParaView_CMAKE_DIR}/pqParaViewPlugin.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqParaViewPlugin.h.in
+-      ${ParaView_CMAKE_DIR}/branded_paraview_initializer.cxx.in
+-      ${ParaView_CMAKE_DIR}/branded_paraview_main.cxx.in
+-      ${ParaView_CMAKE_DIR}/branded_paraview_initializer.h.in
+-      ${ParaView_CMAKE_DIR}/ParaViewCPackOptions.cmake.in
+-      ${ParaView_CMAKE_DIR}/pv-forward.c.in
+-      # originaly from Qt/Components
+-      ${ParaView_CMAKE_DIR}/pqObjectPanelImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqObjectPanelImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqDisplayPanelImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqDisplayPanelImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqViewOptionsImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqViewOptionsImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqActionGroupImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqActionGroupImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqViewFrameActionGroupImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqViewFrameActionGroupImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqDockWindowImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqDockWindowImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqDisplayPanelDecoratorImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqDisplayPanelDecoratorImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pq3DWidgetImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pq3DWidgetImplementation.cxx.in
+-      # originaly from Qt/Core
+-      ${ParaView_CMAKE_DIR}/pqViewModuleImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqViewModuleImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqAutoStartImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqAutoStartImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqGraphLayoutStrategyImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqGraphLayoutStrategyImplementation.cxx.in
+-      ${ParaView_CMAKE_DIR}/pqTreeLayoutStrategyImplementation.h.in
+-      ${ParaView_CMAKE_DIR}/pqTreeLayoutStrategyImplementation.cxx.in)
++  # install all cmake files.
+   INSTALL(
+-      FILES ${cmakeDevFiles} 
++      # the extra "/" is essential to ensure we don't end up with an extra
++      # directory at the install location.
++      DIRECTORY "${ParaView_CMAKE_DIR}/" 
+       DESTINATION ${PV_INSTALL_CMAKE_DIR}
+       COMPONENT Development)
+       
diff --git a/debian/patches/series b/debian/patches/series
index 55595b6..a8fd05c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix_format_not_a_string_FTBFS.patch
 workaround_strict-aliasing_in_mpi4py_MPI.patch
 fix_FTBFS_boost149.patch
 fix_FTBFS_gcc-4.7.patch
+install_all_cmake_files.patch

-- 
Paraview packaging