[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-87-gc8bfc6a

[Anton Gladky]

The following commit has been merged in the master branch:
commit c8bfc6a07fa491035b16cdff4ff11a3de00e6e5b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Sep 14 21:19:11 2011 +0200

    Move html-docs into paraview-doc.

diff --git a/debian/control b/debian/control
index 9f0bd6b..50be1e3 100644
--- a/debian/control
+++ b/debian/control
@@ -89,30 +89,6 @@ 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
diff --git a/debian/paraview-doc-html.install b/debian/paraview-doc-html.install
deleted file mode 100644
index e8b9d05..0000000
--- a/debian/paraview-doc-html.install
+++ /dev/null
@@ -1,2 +0,0 @@
-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-html.doc-base b/debian/paraview-doc.doc-base
similarity index 100%
rename from debian/paraview-doc-html.doc-base
rename to debian/paraview-doc.doc-base
diff --git a/debian/paraview-doc.docs b/debian/paraview-doc.docs
index 0cd9fb8..dba548f 100644
--- a/debian/paraview-doc.docs
+++ b/debian/paraview-doc.docs
@@ -1 +1,3 @@
 debian/tmp/usr/share/doc/paraview-3.10/paraview.qch
+debian/tmp/usr/share/doc/paraview-3.10/*.html
+debian/tmp/usr/share/doc/paraview-3.10/Book

-- 
Paraview packaging