[SCM] Paraview packaging branch, experimental, updated. debian/3.98.0-1_exp1-10-g139fbb1

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 124b4748bec2fea42275533bcc95d1977b40a90b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu May 2 21:52:47 2013 +0200

    Fix FTBFS of the git-vesion.

diff --git a/debian/paraview.install b/debian/paraview.install
index ae50bcb..5cadb5f 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -2,7 +2,6 @@ debian/*.xpm usr/share/pixmaps/
 debian/*.desktop usr/share/applications/
 usr/bin/paraview
 usr/lib/paraview/paraview
-usr/lib/paraview/plugins
 usr/bin/pvbatch
 usr/lib/paraview/pvbatch
 usr/bin/pvblot
diff --git a/debian/patches/fix_development_file_install.patch b/debian/patches/fix_development_file_install.patch
new file mode 100644
index 0000000..928dacf
--- /dev/null
+++ b/debian/patches/fix_development_file_install.patch
@@ -0,0 +1,37 @@
+Description: fix installing of development files
+Author: Utkarsh Ayachit
+Applied-Upstream: 
+Last-Update: 2013-05-02
+
+--- paraview-3.98.1.orig/Utilities/PythonInitializer/CMakeLists.txt
++++ paraview-3.98.1/Utilities/PythonInitializer/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ set (vtkUtilitiesPythonInitializer_SOURCE_DIR
+   ${CMAKE_CURRENT_SOURCE_DIR})
+-set (vtkUtilitiesWrapClientServer_BINARY_DIR
++set (vtkUtilitiesPythonInitializer_BINARY_DIR
+   ${CMAKE_CURRENT_BINARY_DIR})
+ vtk_module(vtkUtilitiesPythonInitializer
+   DEPENDS
+--- paraview-3.98.1.orig/CoProcessing/Catalyst/CMakeLists.txt
++++ paraview-3.98.1/CoProcessing/Catalyst/CMakeLists.txt
+@@ -70,7 +70,7 @@ if (CMAKE_Fortran_COMPILER_WORKS)
+   set (${vtk-module}_HDRS
+        ${${vtk-module}_HDRS}
+        FortranAdaptorAPI.h
+-       FortranAdaptorAPIMangling.h)
++       ${CMAKE_CURRENT_BINARY_DIR}/FortranAdaptorAPIMangling.h)
+ endif()
+ 
+ vtk_module_library(${vtk-module} ${Module_SRCS})
+--- paraview-3.98.1.orig/CoProcessing/PythonCatalyst/CMakeLists.txt
++++ paraview-3.98.1/CoProcessing/PythonCatalyst/CMakeLists.txt
+@@ -72,7 +72,7 @@ if (CMAKE_Fortran_COMPILER_WORKS)
+   set (${vtk-module}_HDRS
+        ${${vtk-module}_HDRS}
+        FortranPythonAdaptorAPI.h
+-       FortranPythonAdaptorAPIMangling.h)
++       ${CMAKE_CURRENT_BINARY_DIR}/FortranPythonAdaptorAPIMangling.h)
+ endif()
+ 
+ vtk_module_library(${vtk-module} ${Module_SRCS})
diff --git a/debian/patches/series b/debian/patches/series
index 12c90db..a2f173e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_manpages_errors.patch
+fix_development_file_install.patch
diff --git a/debian/rules b/debian/rules
index 172a128..074d33c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,6 @@ extra_flags += -Wno-dev \
 	-DVTK_INSTALL_DATA_DIR="share/paraview" \
 	-DVTK_INSTALL_DOC_DIR="share/doc/paraview" \
 	-DVTK_INSTALL_PACKAGE_DIR="lib/cmake/paraview" \
-	-DPV_INSTALL_PLUGIN_DIR="lib/paraview/plugins" \
 	-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
 	-DVTK_USE_SYSTEM_TIFF=ON \
 	-DVTK_USE_SYSTEM_ZLIB=ON \
@@ -53,8 +52,9 @@ extra_flags += -Wno-dev \
 	-DVTK_USE_OGGTHEORA_ENCODER=ON \
 	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
 	-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
-	-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \
-
+	-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON
+	
+  
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
 

-- 
Paraview packaging