[paraview] 01/01: 1
Anton Gladky
gladk at moszumanska.debian.org
Fri Feb 5 12:54:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch 5.0
in repository paraview.
commit 35ac4b98c606afea6c24f96879fd94e39406682b
Author: Anton Gladky <gladk at debian.org>
Date: Tue Feb 2 21:34:57 2016 +0100
1
---
debian/control | 100 ++++--------
debian/copyright | 140 +++++++++++-----
debian/paraview-dev.install | 4 +-
debian/paraview-doc.doc-base | 24 ---
debian/paraview-doc.docs | 1 -
debian/paraview-python.install | 3 +-
debian/paraview.install | 2 -
debian/patches/ffmpeg_2.9.patch | 98 ------------
debian/patches/fix_ftbfs_freetype.patch | 27 ----
debian/patches/fix_ftbfs_gcc49.patch | 26 +--
debian/patches/fix_manpages_errors.patch | 246 ++++++++++++++++++-----------
debian/patches/fix_path_paraview.patch | 10 +-
debian/patches/fix_rescale_over_time.patch | 35 ----
debian/patches/reduce_cmake_error.cmake | 34 ----
debian/patches/series | 12 +-
debian/rules | 6 +-
debian/watch | 2 +-
17 files changed, 316 insertions(+), 454 deletions(-)
diff --git a/debian/control b/debian/control
index e5a46de..9dea147 100644
--- a/debian/control
+++ b/debian/control
@@ -1,66 +1,33 @@
Source: paraview
-Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
- Anton Gladky <gladk at debian.org>
Section: science
-Testsuite: autopkgtest
Priority: extra
-Build-Depends: debhelper (>= 9),
- cmake,
- libqt4-dev,
- libsqlite3-dev,
- qt4-dev-tools,
- libboost-all-dev,
- libavformat-dev (>= 4:0.7.1),
- libavutil-dev,
- libavcodec-dev,
- libswscale-dev,
- python-dev,
- dh-python,
- libglu1-mesa-dev,
- libxt-dev,
- python-all,
- python-all-dev (>= 2.7),
- python-all-dev (<< 2.8),
- libxext-dev,
- doxygen,
- graphviz,
- gnuplot,
- libtiff-dev,
- libpng-dev,
- libjpeg-dev,
- libxml2-dev,
- libexpat-dev,
- zlib1g-dev,
- libfreetype6-dev,
- libmysqlclient-dev,
- libpq-dev,
- libtheora-dev,
- libogg-dev,
- mpi-default-dev,
- mpi-default-bin,
- libhdf5-dev,
- hdf5-tools,
- libgl2ps-dev,
- libqtwebkit-dev,
- libeigen3-dev,
- libjsoncpp-dev
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/paraview.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/paraview.git
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
+ Anton Gladky <gladk at debian.org>
+Build-Depends: debhelper (>= 9), cmake (>= 2.6.3),
+ libqt4-dev (>= 4.3.3-2), libsqlite3-dev,
+ qt4-dev-tools, libboost-all-dev,
+ libavformat-dev (>= 4:0.7.1),
+ libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, dh-python,
+ libglu1-mesa-dev, libxt-dev, python-all,
+ python-all-dev (>= 2.7), python-all-dev (<< 2.8),
+ libxext-dev, doxygen, graphviz, gnuplot, libtiff-dev, libpng-dev, libjpeg-dev,
+ libxml2-dev, libexpat-dev,
+ libxdmf-dev,
+ zlib1g-dev, libfreetype6-dev, libmysqlclient-dev, libpq-dev, libtheora-dev,
+ libogg-dev, mpi-default-dev, mpi-default-bin, libhdf5-dev (>= 1.8.8), hdf5-tools,
+ libgl2ps-dev, libqtwebkit-dev (>=2.2.1), libeigen3-dev, libjsoncpp-dev
+Standards-Version: 3.9.5
Homepage: http://www.paraview.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/paraview.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/paraview.git
+XS-Testsuite: autopkgtest
Package: paraview
Architecture: any
-Depends: tcl8.5 | tclsh,
- ${shlibs:Depends},
- ${misc:Depends},
- python-matplotlib
-Recommends: mpi-default-bin,
- paraview-python,
- paraview-doc
-Suggests: hdf5-tools,
- h5utils
+Depends: tcl8.5 | tclsh, ${shlibs:Depends}, ${misc:Depends}, python-matplotlib
+Suggests: hdf5-tools, h5utils
+Recommends: mpi-default-bin, paraview-python, paraview-doc
Description: Parallel Visualization Application
ParaView is an open-source, multi-platform application designed to
visualize data sets of size varying from small to very large. The
@@ -77,16 +44,12 @@ Description: Parallel Visualization Application
supercomputers. Under the hood, ParaView uses the Visualization
Toolkit as the data processing and rendering engine and has a user
interface written using Qt.
-
+
Package: paraview-dev
Architecture: any
Section: libdevel
-Depends: qt4-dev-tools,
- ${shlibs:Depends},
- ${misc:Depends},
- paraview (= ${binary:Version}),
- libeigen3-dev
-Recommends: qt4-dev-tools
+Depends: qt4-dev-tools, ${shlibs:Depends}, ${misc:Depends}, paraview (= ${binary:Version}), libeigen3-dev
+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
visualize data sets of size varying from small to very large. The
@@ -106,9 +69,9 @@ Description: Parallel Visualization Application. Development header files
Package: paraview-doc
Architecture: all
+Recommends: paraview
Section: doc
Depends: ${misc:Depends}
-Recommends: paraview
Description: Parallel Visualization Application. Comprehensive documentation
ParaView is an open-source, multi-platform application designed to
visualize data sets of size varying from small to very large. The
@@ -129,13 +92,8 @@ Description: Parallel Visualization Application. Comprehensive documentation
Package: paraview-python
Architecture: any
Section: python
-Depends: paraview (= ${binary:Version}),
- ${python:Depends},
- ${misc:Depends},
- ${shlibs:Depends},
- python (>= 2.7),
- python (<< 2.8),
- python-vtk6
+Depends: paraview (= ${binary:Version}), ${python:Depends}, ${misc:Depends},
+ ${shlibs:Depends}, python (>= 2.7), python (<<2.8), python-vtk6
Provides: ${python:Provides}
Description: Parallel Visualization Application. python-support
ParaView is an open-source, multi-platform application designed to
diff --git a/debian/copyright b/debian/copyright
index ca5d64d..e1b4b7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,93 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ParaView
Source: http://www.paraview.org/
-Files-Excluded: Web VTK/Examples/GUI/Win32
+Upstream-Name: ParaView
+Files-Excluded:
+ VTK/Web/WebGLExporter/glMatrix.js
+ VTK/Web/JavaScript/Ext/jquery-ui/jquery-ui-1.10.0.min.js
+ VTK/Web/JavaScript/Ext/core/vgl.min.js
+ VTK/Web/JavaScript/Ext/core/jquery-1.8.3.min.js
+ VTK/Web/JavaScript/Ext/core/autobahn.min.js
+ VTK/Web/JavaScript/Lib/vtkweb.js
+ VTK/Examples/GUI/Win32/vtkMFC/*.chm
+ VTK/Web/JavaScript/Widgets/CatalystBrowser/vtkweb-widget-catalyst-analysis-bench.js
+ VTK/Web/JavaScript/Widgets/CatalystBrowser/vtkweb-widget-catalyst-analysis-cost-estimate.js
+ VTK/Web/JavaScript/Widgets/CatalystBrowser/*.js
+ Web/Applications/Parallel/www/js/jquery.backstretch.min.js
+ Web/Widgets/Pipeline/*.js
+ Web/Widgets/PipelineBrowser/paraview.ui.pipeline.js
+ VTK/Examples/GUI/Win32
+ VTK/Web
+
+Files: *
+Copyright: 2005-2008 Sandia Corporation, Kitware Inc.
+License: Other
+ ParaView License Version 1.2
+ ========================================================================
+ .
+ Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+ .
+ Sandia National Laboratories, New Mexico
+ PO Box 5800
+ Albuquerque, NM 87185
+ .
+ Kitware Inc.
+ 28 Corporate Drive
+ Clifton Park, NY 12065
+ USA
+ .
+ Under the terms of Contract DE-AC04-94AL85000, there is a
+ non-exclusive license for use of this work by or on behalf of the
+ U.S. Government.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the
+ distribution.
+ .
+ * Neither the name of Kitware nor the names of any contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ========================================================================
Files: *
Copyright: 2000-2005 Kitware Inc. 28 Corporate Drive, Suite 204,
Clifton Park, NY, 12065, USA.
- 2000-2005 Kitware Inc. 28 Corporate Drive, Suite 204,
- Clifton Park, NY, 12065, USA.
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- .
+ .
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- .
+ .
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the
distribution.
- .
+ .
* Neither the name of Kitware nor the names of any contributors may
be used to endorse or promote products derived from this software
without specific prior written permission.
- .
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -43,11 +106,11 @@ License: BSD-like
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
- .
+ .
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
- .
+ .
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
@@ -203,7 +266,7 @@ License: BSD-like
California, Sun Microsystems, Inc., Scriptics Corporation,
and other parties. The following terms apply to all files associated
with the software unless explicitly disclaimed in individual files.
- .
+ .
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose, provided
that existing copyright notices are retained in all copies and that this
@@ -213,20 +276,20 @@ License: BSD-like
and need not follow the licensing terms described here, provided that
the new terms are clearly indicated on the first page of each file where
they apply.
- .
+ .
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- .
+ .
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
- .
+ .
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
in the software and related documentation as defined in the Federal
@@ -345,7 +408,7 @@ License: BSD-like
Files: VTK/ThirdParty/jsoncpp/*
Copyright: 2007-2010 by Baptiste Lepilleur
-License: Expat
+License: MIT or pulbic-domain
In jurisdictions which recognize Public Domain property, the user of this
software may choose to accept it either as 1) Public Domain, 2) under the
conditions of the MIT License (see below), or 3) under the terms of dual
@@ -387,16 +450,16 @@ License: BSD-like
(3) Permission for use of this software is granted only if the user accepts
full responsibility for any undesirable consequences; the authors accept
NO LIABILITY for damages of any kind.
- .
+ .
These conditions apply to any software derived from or based on the IJG code,
not just to the unmodified library. If you use our work, you ought to
acknowledge us.
- .
+ .
Permission is NOT granted for the use of any IJG author's name or company name
in advertising or publicity relating to this software or products derived from
it. This software may be referred to only as "the Independent JPEG Group's
software".
- .
+ .
We specifically permit and encourage the use of this software as the basis of
commercial products, provided that all warranty or liability claims are
assumed by the product vendor.
@@ -408,29 +471,29 @@ License: BSD-like
Redistribution and use in source and binary forms, with or without
modification, are permitted for any purpose (including commercial purposes)
provided that the following conditions are met:
- .
+ .
1. Redistributions of source code must retain the above copyright notice,
this list of conditions, and the following disclaimer.
- .
+ .
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions, and the following disclaimer in the documentation
and/or materials provided with the distribution.
- .
+ .
3. In addition, redistributions of modified forms of the source or binary
code must carry prominent notices stating that the original code was
changed and the date of the change.
- .
+ .
4. All publications or advertising materials mentioning features or use of
this software are asked, but not required, to acknowledge that it was
developed by The HDF Group and by the National Center for Supercomputing
Applications at the University of Illinois at Urbana-Champaign and
credit the contributors.
- .
+ .
5. Neither the name of The HDF Group, the name of the University, nor the
name of any Contributor may be used to endorse or promote products derived
from this software without specific prior written permission from
The HDF Group, the University, or the Contributor, respectively.
- .
+ .
DISCLAIMER:
THIS SOFTWARE IS PROVIDED BY THE HDF GROUP AND THE CONTRIBUTORS
"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no
@@ -455,10 +518,10 @@ License: BSD-like
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
- .
+ .
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
- .
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -467,6 +530,7 @@ License: BSD-like
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Files: VTK/ThirdParty/freetype/*
Copyright: 2006-2011 David Turner, Robert Wilhelm, and Werner Lemberg.
License: BSD-like
@@ -565,10 +629,10 @@ License: BSD-like
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
- .
+ .
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
- .
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -583,19 +647,19 @@ License: BSD-like
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- .
+ .
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- .
+ .
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
- .
+ .
* Neither the name of Sandia Corporation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
- .
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -620,7 +684,7 @@ License: BSD-like
If software is modified to produce derivative works, such modified software
should be clearly marked, so as not to confuse it with the version available
from LANL.
- .
+ .
Additionally, redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following conditions
are met:
@@ -633,7 +697,7 @@ License: BSD-like
Laboratory, LANL, the U.S. Government, nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
- .
+ .
THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -652,19 +716,19 @@ License: BSD-like
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- .
+ .
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- .
+ .
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer listed
in this license in the documentation and/or other materials
provided with the distribution.
- .
+ .
- Neither the name of the copyright holders nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
- .
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
diff --git a/debian/paraview-dev.install b/debian/paraview-dev.install
index 27ed25d..e2b1f91 100644
--- a/debian/paraview-dev.install
+++ b/debian/paraview-dev.install
@@ -3,6 +3,4 @@ usr/lib/cmake/paraview/*.cmake
usr/lib/cmake/paraview/*.in
usr/lib/cmake/paraview/*.xsl
usr/lib/cmake/paraview/*.cmake
-usr/bin/vtk*
-usr/lib/paraview/site-packages/vtk/*.so
-usr/lib/paraview/*.a
+usr/bin/vtkWrapClientServer
diff --git a/debian/paraview-doc.doc-base b/debian/paraview-doc.doc-base
deleted file mode 100644
index 2d95f79..0000000
--- a/debian/paraview-doc.doc-base
+++ /dev/null
@@ -1,24 +0,0 @@
-Document: paraview-online-documentation
-Title: ParaView documentation
-Author: Kitware
-Abstract: Parallel Visualization Application. Comprehensive 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.
-Section: Science/Data Analysis
-
-Format: HTML
-Index: /usr/share/doc/paraview-doc/Book/Book_Chapter_01_Intro.html
-Files: /usr/share/doc/paraview-doc/Book/*
diff --git a/debian/paraview-doc.docs b/debian/paraview-doc.docs
index 07b0b2a..b0465ba 100644
--- a/debian/paraview-doc.docs
+++ b/debian/paraview-doc.docs
@@ -1,3 +1,2 @@
debian/tmp/usr/share/doc/paraview/paraview.qch
debian/tmp/usr/share/doc/paraview/doxygen
-Applications/ParaView/Documentation/Book
diff --git a/debian/paraview-python.install b/debian/paraview-python.install
index fe2da21..92c42d2 100644
--- a/debian/paraview-python.install
+++ b/debian/paraview-python.install
@@ -1,3 +1,4 @@
usr/bin/pvpython
usr/lib/paraview/pvpython
-usr/lib/paraview/site-packages/vtk/*.so usr/lib/python2.7/dist-packages/paraview/
+usr/lib/paraview/site-packages/vtk/*.so /usr/lib/python2.7/dist-packages/paraview/
+usr/lib/paraview/site-packages/paraview/
diff --git a/debian/paraview.install b/debian/paraview.install
index 2387d06..c30ddcb 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -14,6 +14,4 @@ usr/lib/paraview/*.so.*
usr/lib/paraview/*.so
usr/lib/cmake/paraview/*.png
usr/lib/cmake/paraview/branded_splash.png usr/share/doc/paraview/images/CMake/
-usr/lib/paraview-4.1/*.so usr/lib/
-usr/lib/paraview-4.1/*.so.* usr/lib/
usr/lib/paraview/.plugins
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index 4c4df8f..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
-
-Index: paraview/VTK/CMake/vtkTestFFMPEG.cmake
-===================================================================
---- paraview.orig/VTK/CMake/vtkTestFFMPEG.cmake
-+++ paraview/VTK/CMake/vtkTestFFMPEG.cmake
-@@ -32,8 +32,8 @@ if(FFMPEG_INCLUDE_DIR)
- #include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h>
- int main()
- {
-- img_convert(0, PIX_FMT_RGB24,
-- 0, PIX_FMT_RGB24,
-+ img_convert(0, AV_PIX_FMT_RGB24,
-+ 0, AV_PIX_FMT_RGB24,
- 0, 0);
- return 0;
- }\n")
-Index: paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-===================================================================
---- paraview.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -188,11 +188,11 @@ int vtkFFMPEGWriterInternal::Start()
- c->height = this->Dim[1];
- if (this->Writer->GetCompression())
- {
-- c->pix_fmt = PIX_FMT_YUVJ422P;
-+ c->pix_fmt = AV_PIX_FMT_YUVJ422P;
- }
- else
- {
-- c->pix_fmt = PIX_FMT_BGR24;
-+ c->pix_fmt = AV_PIX_FMT_BGR24;
- }
-
- //to do playback at actual recorded rate, this will need more work see also below
-@@ -271,13 +271,13 @@ int vtkFFMPEGWriterInternal::Start()
- #endif
-
- //for the output of the writer's input...
-- this->rgbInput = avcodec_alloc_frame();
-+ this->rgbInput = av_frame_alloc();
- if (!this->rgbInput)
- {
- vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
- return 0;
- }
-- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height);
-+ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height);
- unsigned char *rgb = new unsigned char[RGBsize];
- if (!rgb)
- {
-@@ -285,10 +285,10 @@ int vtkFFMPEGWriterInternal::Start()
- return 0;
- }
- //The rgb buffer should get deleted when this->rgbInput is.
-- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
-+ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height);
-
- //and for the output to the codec's input.
-- this->yuvOutput = avcodec_alloc_frame();
-+ this->yuvOutput = av_frame_alloc();
- if (!this->yuvOutput)
- {
- vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
-@@ -346,12 +346,12 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
- //convert that to YUV for input to the codec
- #ifdef VTK_FFMPEG_HAS_IMG_CONVERT
- img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
-- (AVPicture *)this->rgbInput, PIX_FMT_RGB24,
-+ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24,
- cc->width, cc->height);
- #else
- //convert that to YUV for input to the codec
- SwsContext* convert_ctx = sws_getContext(
-- cc->width, cc->height, PIX_FMT_RGB24,
-+ cc->width, cc->height, AV_PIX_FMT_RGB24,
- cc->width, cc->height, cc->pix_fmt,
- SWS_BICUBIC, NULL, NULL, NULL);
-
-@@ -490,14 +490,14 @@ void vtkFFMPEGWriterInternal::End()
- if (this->yuvOutput)
- {
- av_free(this->yuvOutput->data[0]);
-- av_free(this->yuvOutput);
-+ av_frame_free(&this->yuvOutput);
- this->yuvOutput = NULL;
- }
-
- if (this->rgbInput)
- {
- av_free(this->rgbInput->data[0]);
-- av_free(this->rgbInput);
-+ av_frame_free(&this->rgbInput);
- this->rgbInput = NULL;
- }
-
diff --git a/debian/patches/fix_ftbfs_freetype.patch b/debian/patches/fix_ftbfs_freetype.patch
deleted file mode 100644
index e21e807..0000000
--- a/debian/patches/fix_ftbfs_freetype.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS against new freetype
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/783842
-Last-Update: 2015-05-05
-
---- paraview-4.1.0+dfsg+1.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
-+++ paraview-4.1.0+dfsg+1/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding
- if (bitmap)
- {
- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
-- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+ metaData.descent = std::min(-static_cast<int>(bitmap->rows - (bitmapGlyph->top - 1)),
- metaData.descent);
- }
- ++heightString;
-@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
- if (bitmap)
- {
- bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
-- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
-- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
-+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
- }
- else
diff --git a/debian/patches/fix_ftbfs_gcc49.patch b/debian/patches/fix_ftbfs_gcc49.patch
index ba33389..98261b6 100644
--- a/debian/patches/fix_ftbfs_gcc49.patch
+++ b/debian/patches/fix_ftbfs_gcc49.patch
@@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/#746896
Forwarded: https://github.com/Kitware/VTK/pull/7
Last-Update: 2014-05-30
---- vtk6-6.1.0+dfsg.orig/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ vtk6-6.1.0+dfsg/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1094,7 +1094,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
+Index: ParaView-v5.0.0-RC1-source/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ ParaView-v5.0.0-RC1-source/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1112,7 +1112,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -18,7 +20,7 @@ Last-Update: 2014-05-30
if (numConsumers == nprocs - 1)
{
-@@ -1585,7 +1588,9 @@ vtkFloatArray **
+@@ -1597,7 +1600,9 @@ vtkFloatArray **
// Exchange int arrays
float **recvArrays = new float * [nprocs];
@@ -29,7 +31,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -1706,7 +1711,9 @@ vtkIdTypeArray **
+@@ -1719,7 +1724,9 @@ vtkIdTypeArray **
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -40,7 +42,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -2810,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2788,7 +2795,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [npoints];
@@ -51,7 +53,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -2830,7 +2839,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2808,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [ncells];
@@ -62,7 +64,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -3027,7 +3038,9 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3007,7 +3018,9 @@ int vtkDistributedDataFilter::AssignGlob
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -73,7 +75,7 @@ Last-Update: 2014-05-30
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
-@@ -3109,10 +3122,16 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3089,10 +3102,16 @@ int vtkDistributedDataFilter::AssignGlob
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -92,7 +94,7 @@ Last-Update: 2014-05-30
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3287,7 +3306,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3267,7 +3286,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
{
// There are no cells in my assigned region
@@ -103,7 +105,7 @@ Last-Update: 2014-05-30
return gids;
}
-@@ -3492,7 +3513,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3472,7 +3493,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -115,7 +117,7 @@ Last-Update: 2014-05-30
for (int i=0; i<nprocs; i++)
{
-@@ -3582,7 +3606,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3562,7 +3586,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
diff --git a/debian/patches/fix_manpages_errors.patch b/debian/patches/fix_manpages_errors.patch
index 2fb6db1..f3162cf 100644
--- a/debian/patches/fix_manpages_errors.patch
+++ b/debian/patches/fix_manpages_errors.patch
@@ -3,9 +3,11 @@ Description: rough editing of manpages, shipped with sources to fix
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-25
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
-@@ -29,8 +29,7 @@
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
+@@ -29,8 +29,7 @@ l l l .
.PP
The \fBicetCreateContext\fP
@@ -15,9 +17,11 @@ Last-Update: 2012-11-25
context, makes it current, and returns a
handle to the new context. The handle returned is of type
\fBIceTContext\fP\&.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
-@@ -46,7 +46,7 @@
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
+@@ -46,7 +46,7 @@ enumerated values:
Automatically
chooses which single image strategy to use based on the number of
processes participating in the composition.
@@ -26,7 +30,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_SINGLE_IMAGE_STRATEGY_BSWAP\fP
The classic binary swap
-@@ -55,7 +55,6 @@
+@@ -55,7 +55,6 @@ partners with another, sends half of its
receives the opposite half from its partner. The processes are then
partitioned into two groups that each have the same image part, and the
algorithm recurses.
@@ -34,7 +38,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_SINGLE_IMAGE_STRATEGY_RADIXK\fP
The radix\-k
-@@ -71,7 +70,6 @@
+@@ -71,7 +70,6 @@ variable or CMake variable.
process partners with another, and one of the processes sends its entire
image to the other. The algorithm recurses with the group of processes
that received images until only one process has an image.
@@ -42,8 +46,10 @@ Last-Update: 2012-11-25
.PP
By default \fBIceT \fPsets the single image strategy to
\fBICET_SINGLE_IMAGE_STRATEGY_AUTOMATIC\fP
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -53,15 +59,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
@@ -15,8 +15,6 @@
\fBicetImageGetColorFormat\fP,\fBicetImageGetDepthFormat\fP\-\- get the format of image buffers
@@ -71,16 +79,18 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -109,6 +107,5 @@
+@@ -109,6 +107,5 @@ This source code is released under the N
\fIicetSetColorFormat\fP(3),
\fIicetSetDepthFormat\fP(3)
.PP
-.igicetImageGetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
-@@ -45,8 +45,7 @@
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
+@@ -45,8 +45,7 @@ is one of the following enumerations:
.PP
.TP
\fBICET_COMPOSITE_MODE_Z_BUFFER\fP
@@ -90,7 +100,7 @@ Last-Update: 2012-11-25
hidden\-surface removal operation. The
compositing operation compares the distance of pixel fragments from the
viewpoint and passes the fragment closest to the user. In order for
-@@ -55,8 +54,7 @@
+@@ -55,8 +54,7 @@ this operation to work, images must have
.TP
\fBICET_COMPOSITE_MODE_BLEND\fP
Blend two fragments together
@@ -100,8 +110,10 @@ Last-Update: 2012-11-25
operator. in
order for this operation to work, images must have a color buffer (set
with \fBicetSetColorFormat\fP)that has an alpha channel and there must be
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -114,7 +126,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -85,8 +81,6 @@
+@@ -85,8 +81,6 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
@@ -123,8 +135,10 @@ Last-Update: 2012-11-25
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
@@ -15,8 +15,6 @@
\fBicetSetColorFormat\fP,\fBicetSetDepthFormat\fP\-\- specifies the buffer formats for \fBIceT \fPto use when creating images
@@ -134,15 +148,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -134,6 +132,5 @@
+@@ -138,6 +136,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetSetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -152,15 +168,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
@@ -15,8 +15,7 @@
\fBicetEnable\fP,\fBicetDisable\fP\-\- enable/disable an \fBIceT \fPfeature.
@@ -171,15 +189,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -177,6 +176,5 @@
+@@ -199,6 +198,5 @@ This source code is released under the N
.PP
\fIicetIsEnabled\fP(3)
.PP
-.igicetDisable|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
@@ -18,18 +18,6 @@
.SH Synopsis
@@ -199,7 +219,7 @@ Last-Update: 2012-11-25
.TS H
l l l .
void \fBicetDrawCallback\fP( \fBIceTDrawCallbackType\fP \fIcallback\fP );
-@@ -70,8 +58,7 @@
+@@ -70,8 +58,7 @@ takes two projection matrices: \fIprojec
and \fImodelview_matrix\fP\&.
Each of these arguments is a 16\-value
array that represents a $4 *4$ transformation of homogeneous
@@ -209,8 +229,10 @@ Last-Update: 2012-11-25
order.
.PP
Note that the \fIprojection_matrix\fP
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
@@ -15,8 +15,7 @@
\fBicetEnable\fP,\fBicetDisable\fP\-\- enable/disable an \fBIceT \fPfeature.
@@ -221,15 +243,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -177,6 +176,5 @@
+@@ -199,6 +198,5 @@ This source code is released under the N
.PP
\fIicetIsEnabled\fP(3)
.PP
-.igicetDisable|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -239,15 +263,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -257,15 +283,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -275,15 +303,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -293,15 +323,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
@@ -15,8 +15,6 @@
\fBicetImageGetColorFormat\fP,\fBicetImageGetDepthFormat\fP\-\- get the format of image buffers
@@ -311,15 +343,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -109,6 +107,5 @@
+@@ -109,6 +107,5 @@ This source code is released under the N
\fIicetSetColorFormat\fP(3),
\fIicetSetDepthFormat\fP(3)
.PP
-.igicetImageGetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -329,15 +363,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -347,15 +383,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -368,7 +406,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -85,8 +81,6 @@
+@@ -85,8 +81,6 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
@@ -377,9 +415,11 @@ Last-Update: 2012-11-25
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
-@@ -48,7 +48,6 @@
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
+@@ -50,7 +50,6 @@ whether they draw into it, this strategy
compositing for more than one tile, but is recommended for the single
tile case because it bypasses some of the communication necessary for
the other multi\-tile strategies.
@@ -387,7 +427,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_DIRECT\fP
As each process renders an image
-@@ -56,7 +55,7 @@
+@@ -58,7 +57,7 @@ for a tile, that image is sent directly
display that tile. This usually results in a few processes receiving
and processing the majority of the data, and is therefore usually an
inefficient strategy.
@@ -396,7 +436,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_SPLIT\fP
Like \fBICET_STRATEGY_DIRECT\fP,
-@@ -65,7 +64,7 @@
+@@ -67,7 +66,7 @@ piece of a tile in such a way that each
about the same amount of data. This strategy is often very efficient,
but due to the large amount of messages passed, it has not proven to be
very scalable or robust.
@@ -405,7 +445,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_REDUCE\fP
A two phase algorithm. In the
-@@ -77,7 +76,6 @@
+@@ -79,7 +78,6 @@ simultaneously. This is a well rounded s
well in a wide variety of multi\-tile applications. (However, in the
special case where only one tile is defined, the sequential strategy is
probably better.)
@@ -413,7 +453,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_VTREE\fP
An extension to the binary tree
-@@ -89,7 +87,7 @@
+@@ -91,7 +89,7 @@ between trees. This strategy is not quit
or \fBICET_STRATEGY_SPLIT\fP,
but
has very well behaved network communication.
@@ -422,8 +462,10 @@ Last-Update: 2012-11-25
.PP
Not all of the strategies support ordered image composition.
\fBICET_STRATEGY_SEQUENTIAL\fP,
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -433,15 +475,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -451,15 +495,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -472,7 +518,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -85,8 +81,6 @@
+@@ -85,8 +81,6 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
@@ -481,8 +527,10 @@ Last-Update: 2012-11-25
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
@@ -15,8 +15,6 @@
\fBicetSetColorFormat\fP,\fBicetSetDepthFormat\fP\-\- specifies the buffer formats for \fBIceT \fPto use when creating images
@@ -492,15 +540,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -134,6 +132,5 @@
+@@ -138,6 +136,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetSetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -510,15 +560,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -528,15 +580,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -546,15 +600,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -564,15 +620,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
+Index: ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
++++ ParaView-v5.0.0-RC1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -582,7 +640,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
diff --git a/debian/patches/fix_path_paraview.patch b/debian/patches/fix_path_paraview.patch
index 9270bb3..a42601b 100644
--- a/debian/patches/fix_path_paraview.patch
+++ b/debian/patches/fix_path_paraview.patch
@@ -25,10 +25,12 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- paraview-4.1.0.orig/Wrapping/Python/paraview/__init__.py
-+++ paraview-4.1.0/Wrapping/Python/paraview/__init__.py
-@@ -9,6 +9,10 @@ it provides:
- simple
+Index: ParaView-v5.0.0-RC1-source/Wrapping/Python/paraview/__init__.py
+===================================================================
+--- ParaView-v5.0.0-RC1-source.orig/Wrapping/Python/paraview/__init__.py
++++ ParaView-v5.0.0-RC1-source/Wrapping/Python/paraview/__init__.py
+@@ -17,6 +17,10 @@ ParaView modules to force backwards comp
+ from paraview.simple import *
"""
+import sys
diff --git a/debian/patches/fix_rescale_over_time.patch b/debian/patches/fix_rescale_over_time.patch
deleted file mode 100644
index 0fde993..0000000
--- a/debian/patches/fix_rescale_over_time.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b3c276ee364710cce74599cdaf781e31c78a68a9 Mon Sep 17 00:00:00 2001
-From: Joachim Pouderoux <joachim.pouderoux at kitware.com>
-Date: Thu, 16 Jan 2014 17:15:48 +0100
-Subject: [PATCH] BUG: Fix rescale over time in color map editor
-
-Rename some function calls which were performed on the
-non-over-time version.
-
-The functionnality was broken in PV - since July 2013 I guess.
-
-Change-Id: I90abb87fc16067aed0ee4a8cd167282595948d07
----
-
-Index: paraview/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h
-===================================================================
---- paraview.orig/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h
-+++ paraview/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h
-@@ -117,7 +117,7 @@ public:
- {
- vtkSMPVRepresentationProxy* self =
- vtkSMPVRepresentationProxy::SafeDownCast(proxy);
-- return self? self->RescaleTransferFunctionToDataRange() : false;
-+ return self? self->RescaleTransferFunctionToDataRangeOverTime() : false;
- }
-
- // Description:
-@@ -129,7 +129,7 @@ public:
- vtkSMPVRepresentationProxy* self =
- vtkSMPVRepresentationProxy::SafeDownCast(proxy);
- return self?
-- self->RescaleTransferFunctionToDataRange(arrayname, attribute_type) : false;
-+ self->RescaleTransferFunctionToDataRangeOverTime(arrayname, attribute_type) : false;
- }
-
- protected:
diff --git a/debian/patches/reduce_cmake_error.cmake b/debian/patches/reduce_cmake_error.cmake
deleted file mode 100644
index b99ee3d..0000000
--- a/debian/patches/reduce_cmake_error.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-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 9188579..e646759 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,8 @@
fix_manpages_errors.patch
-fix_libav10.patch
fix_path_paraview.patch
-fix_FTBFS_KWSys.patch
fix_ftbfs_gcc49.patch
-fix_GLintptr_FTBFS.patch
-fix_ftbfs_freetype.patch
-reduce_cmake_error.cmake
-ffmpeg_2.9.patch
-fix_rescale_over_time.patch
+#fix_freetype_FTBFS.patch
+use_system_sqlite.patch
+use_system_xdmf.patch
+a.patch
+remove_webgl.patch
diff --git a/debian/rules b/debian/rules
index 6f9c6e5..dbde855 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="-pv" \
+ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DVTK_USE_SYSTEM_TIFF=ON \
-DVTK_USE_SYSTEM_ZLIB=ON \
-DBUILD_EXAMPLES=OFF \
@@ -53,11 +53,11 @@ extra_flags += -Wno-dev \
-DPARAVIEW_ENABLE_PYTHON=ON \
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \
+ -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl=OFF \
-DEigen_DIR=/usr/include/eigen3
override_dh_auto_configure:
- touch VTK/Web/WebGLExporter/glMatrix.js
dh_auto_configure -- $(extra_flags)
override_dh_compress:
@@ -65,6 +65,8 @@ override_dh_compress:
override_dh_install:
dh_install --list-missing
+ #Delete all pyc files
+ find . -name '*.pyc' -print0 | xargs -0 rm -f
override_dh_makeshlibs:
dh_makeshlibs -V'paraview (>= $(UPSTREAM_VERSION)), paraview (<< $(UPSTREAM_VERSION).)'
diff --git a/debian/watch b/debian/watch
index 9b095ca..e92e549 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+opts=repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
https://github.com/Kitware/ParaView/tags .*/v?(\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git
More information about the debian-science-commits
mailing list