[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-78-gff19b7e

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit ff19b7e9da8ed02dfbd6d2273828441fbd2d4610
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Sun Sep 11 16:36:26 2011 +0000

    Split documentation into qch and HTML
    Fix lintian reports

diff --git a/debian/control b/debian/control
index 51b1fca..9f0bd6b 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Description: Parallel Visualization Application
 Package: paraview-dev
 Architecture: any
 Section: libdevel
-Depends: qt4-dev-tools, ${misc:Depends}, paraview (= ${binary:Version})
+Depends: qt4-dev-tools, ${shlibs:Depends}, ${misc:Depends}, paraview (= ${binary:Version})
 Recommends: qt4-dev-tools (>= 4.3.3-2)
 Description: Parallel Visualization Application. Development header files
  ParaView is an open-source, multi-platform application designed to
@@ -89,10 +89,34 @@ Description: Parallel Visualization Application. Comprehensive documentation
  Toolkit as the data processing and rendering engine and has a user
  interface written using Qt. Comprehensive documentation.
 
+Package: paraview-doc-html
+Architecture: all
+Recommends: paraview
+Section: doc
+Depends: ${misc:Depends}
+Description: Parallel Visualization Application. HTML Documentation
+ ParaView is an open-source, multi-platform application designed to
+ visualize data sets of size varying from small to very large. The
+ goals of the ParaView project include the following:
+ .
+     * Develop an open-source, multi-platform visualization application.
+     * Support distributed computation models to process large data sets.
+     * Create an open, flexible, and intuitive user interface.
+     * Develop an extensible architecture based on open standards.
+ .
+ ParaView runs on distributed and shared memory parallel as well as
+ single processor systems and has been successfully tested on Windows,
+ Mac OS X, Linux and various Unix workstations, clusters and
+ supercomputers. Under the hood, ParaView uses the Visualization
+ Toolkit as the data processing and rendering engine and has a user
+ interface written using Qt.
+ .
+ The documentation is provided in HTML format.
+
 Package: paraview-python
 Architecture: any
 Section: python
-Depends: paraview, ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: paraview (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Conflicts: python-vtk
 XB-Python-Version: ${python:Versions}
diff --git a/debian/paraview-dev.install b/debian/paraview-dev.install
index 40079d0..b705de0 100644
--- a/debian/paraview-dev.install
+++ b/debian/paraview-dev.install
@@ -1,5 +1,4 @@
 usr/include
-usr/lib/paraview/*.so
 usr/lib/paraview/CMake/*.cmake
 usr/lib/paraview/CMake/*.in
 usr/lib/paraview/*.cmake
diff --git a/debian/paraview-doc.doc-base b/debian/paraview-doc-html.doc-base
similarity index 100%
rename from debian/paraview-doc.doc-base
rename to debian/paraview-doc-html.doc-base
diff --git a/debian/paraview-doc-html.install b/debian/paraview-doc-html.install
new file mode 100644
index 0000000..e8b9d05
--- /dev/null
+++ b/debian/paraview-doc-html.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/paraview-3.10/*.html usr/share/doc/paraview-doc
+debian/tmp/usr/share/doc/paraview-3.10/Book usr/share/doc/paraview-doc
diff --git a/debian/paraview-doc.docs b/debian/paraview-doc.docs
index b8114bb..0cd9fb8 100644
--- a/debian/paraview-doc.docs
+++ b/debian/paraview-doc.docs
@@ -1 +1 @@
-debian/build/Documentation/*
+debian/tmp/usr/share/doc/paraview-3.10/paraview.qch
diff --git a/debian/paraview.install b/debian/paraview.install
index dfd5622..06fdbc7 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -13,6 +13,7 @@ usr/lib/paraview/pvrenderserver
 usr/bin/pvserver
 usr/lib/paraview/pvserver
 usr/lib/paraview/*.so.*
+usr/lib/paraview/*.so
 usr/lib/paraview/CMake/*.png
 usr/share
 usr/lib/paraview/vistrails/plugin/pgui/resources/images/* usr/share/doc/paraview/images/vistrails/pgui/images
diff --git a/debian/paraview.lintian-overrides b/debian/paraview.lintian-overrides
index edc4839..45e8816 100644
--- a/debian/paraview.lintian-overrides
+++ b/debian/paraview.lintian-overrides
@@ -1,3 +1,5 @@
 # These embedded libraries, seems, have different versions than in repository.
 # The code is incompatible with repo-versions.
 paraview binary: embedded-library usr/lib/paraview/libvtkftgl.so.pv3.10: ftgl
+paraview: postinst-has-useless-call-to-ldconfig
+paraview: postrm-has-useless-call-to-ldconfig
diff --git a/debian/patches/series b/debian/patches/series
index e553632..81836d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ change_std_parameter_for_compiler.patch
 paraview-fix-libav07-compat.patch
 fix_vtkxdmf_xt.patch
 removesqlite.patch
+install_htmldoc.patch

-- 
Paraview packaging