diff -Nru paraview-5.4.1+dfsg4/debian/changelog paraview-5.4.1+dfsg4/debian/changelog --- paraview-5.4.1+dfsg4/debian/changelog 2018-08-20 13:41:42.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/changelog 2018-09-17 16:59:09.000000000 +0000 @@ -1,14 +1,11 @@ -paraview (5.4.1+dfsg4-3ubuntu2) cosmic; urgency=medium +paraview (5.4.1+dfsg4-3.1) unstable; urgency=medium - * Cherry-pick a patch from Debian/Upstream to fix a build issue + * Non-maintainer upload. + * Backport upstream FTBFS fixes, thanks to Juhani Numminen. + (Closes: #906714) + * Remove tcl8.5 as first dependency alternative. (Closes: #905980) - -- Gianfranco Costamagna Mon, 20 Aug 2018 15:41:42 +0200 - -paraview (5.4.1+dfsg4-3ubuntu1) cosmic; urgency=medium - - * debian/patches/qt_5.11.patch: Qt 5.11 compatibility. - - -- Iain Lane Thu, 16 Aug 2018 14:59:01 +0100 + -- Adrian Bunk Mon, 17 Sep 2018 19:59:09 +0300 paraview (5.4.1+dfsg4-3) unstable; urgency=medium diff -Nru paraview-5.4.1+dfsg4/debian/control paraview-5.4.1+dfsg4/debian/control --- paraview-5.4.1+dfsg4/debian/control 2018-04-22 10:35:56.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/control 2018-09-17 16:59:09.000000000 +0000 @@ -68,7 +68,7 @@ Package: paraview Architecture: any -Depends: tcl8.5 | tclsh, +Depends: tclsh, ${shlibs:Depends}, ${misc:Depends}, python-matplotlib, diff -Nru paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch --- paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch 2018-09-17 16:59:09.000000000 +0000 @@ -0,0 +1,115 @@ +From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001 +From: Robert O'Bara +Date: Thu, 24 May 2018 09:49:28 -0400 +Subject: ENH: Changes needed to support Qt 5.11 + +Basically needed to add missing header files. +--- + Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 + + Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 + + Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 + + Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx | 1 + + Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 + + Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++ + Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 + + Qt/Components/pqChangeInputDialog.cxx | 1 + + Qt/Components/pqCinemaTrackSelection.cxx | 1 + + Qt/Python/pqPythonShell.cxx | 1 + + 10 files changed, 11 insertions(+) + +Index: paraview-5.4.1+dfsg4/Plugins/SLACTools/pqSLACDataLoadManager.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Plugins/SLACTools/pqSLACDataLoadManager.cxx ++++ paraview-5.4.1+dfsg4/Plugins/SLACTools/pqSLACDataLoadManager.cxx +@@ -33,6 +33,7 @@ + #include "vtkSMProperty.h" + #include "vtkSMSourceProxy.h" + ++#include + #include + #include + +Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqColorMapEditor.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqColorMapEditor.cxx ++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqColorMapEditor.cxx +@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include + #include + #include ++#include + #include + + class pqColorMapEditor::pqInternals +Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx ++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx +@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include "vtkSMUncheckedPropertyHelper.h" + + #include ++#include + + class pqDoubleRangeSliderPropertyWidget::pqInternals + { +Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx ++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx +@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include + #include + #include ++#include + + //----------------------------------------------------------------------------- + pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation( +Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx ++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx +@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include "vtkSMPropertyHelper.h" + #include "vtkSMSourceProxy.h" + ++#include + #include + #include + #include +Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx ++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx +@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include "vtkSMProxy.h" + + #include ++#include + + class pqViewResolutionPropertyWidget::pqInternals + { +Index: paraview-5.4.1+dfsg4/Qt/Components/pqChangeInputDialog.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/Components/pqChangeInputDialog.cxx ++++ paraview-5.4.1+dfsg4/Qt/Components/pqChangeInputDialog.cxx +@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include "vtkSMProxy.h" + #include "vtkSmartPointer.h" + ++#include + #include + #include + #include +Index: paraview-5.4.1+dfsg4/Qt/Components/pqCinemaTrackSelection.cxx +=================================================================== +--- paraview-5.4.1+dfsg4.orig/Qt/Components/pqCinemaTrackSelection.cxx ++++ paraview-5.4.1+dfsg4/Qt/Components/pqCinemaTrackSelection.cxx +@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + + ========================================================================*/ + #include ++#include + + #include "vtkPVArrayInformation.h" + #include "vtkPVDataInformation.h" diff -Nru paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch --- paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch 2018-09-17 16:59:09.000000000 +0000 @@ -0,0 +1,24 @@ +From f9c7e4b01341f45aec55f452b583c544e2557ca4 Mon Sep 17 00:00:00 2001 +From: Joachim Pouderoux +Date: Thu, 9 Aug 2018 11:07:54 -0400 +Subject: Fix StreamLinesRepresentation plugin documentation issue + +--- + Plugins/StreamLinesRepresentation/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Plugins/StreamLinesRepresentation/CMakeLists.txt b/Plugins/StreamLinesRepresentation/CMakeLists.txt +index 5d656a54b8..86c24964fe 100644 +--- a/Plugins/StreamLinesRepresentation/CMakeLists.txt ++++ b/Plugins/StreamLinesRepresentation/CMakeLists.txt +@@ -41,7 +41,6 @@ encode_files_as_strings(ENCODED_STRING_FILES + + add_paraview_plugin( + StreamLinesRepresentation "0.1" +- DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc" + SERVER_MANAGER_XML StreamLinesRepresentation.xml + SERVER_MANAGER_SOURCES + vtkStreamLinesRepresentation.cxx +-- +2.11.0 + diff -Nru paraview-5.4.1+dfsg4/debian/patches/f9c7e4b01341f45aec55f452b583c544e2557ca4.patch paraview-5.4.1+dfsg4/debian/patches/f9c7e4b01341f45aec55f452b583c544e2557ca4.patch --- paraview-5.4.1+dfsg4/debian/patches/f9c7e4b01341f45aec55f452b583c544e2557ca4.patch 2018-08-20 13:41:41.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/patches/f9c7e4b01341f45aec55f452b583c544e2557ca4.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Origin: https://gitlab.kitware.com/paraview/paraview/commit/f9c7e4b01341f45aec55f452b583c544e2557ca4 -Last-Update: 2018-08-20 - ---- paraview-5.4.1+dfsg4.orig/Plugins/StreamLinesRepresentation/CMakeLists.txt -+++ paraview-5.4.1+dfsg4/Plugins/StreamLinesRepresentation/CMakeLists.txt -@@ -43,7 +43,6 @@ encode_files_as_strings(ENCODED_STRING_F - - add_paraview_plugin( - StreamLinesRepresentation "0.1" -- DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc" - SERVER_MANAGER_XML StreamLinesRepresentation.xml - SERVER_MANAGER_SOURCES - vtkStreamLinesRepresentation.cxx diff -Nru paraview-5.4.1+dfsg4/debian/patches/qt_5.11.patch paraview-5.4.1+dfsg4/debian/patches/qt_5.11.patch --- paraview-5.4.1+dfsg4/debian/patches/qt_5.11.patch 2018-08-16 13:58:07.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/patches/qt_5.11.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001 -From: Robert O'Bara -Date: Thu, 24 May 2018 09:49:28 -0400 -Subject: [PATCH] ENH: Changes needed to support Qt 5.11 - -Basically needed to add missing header files. - -Origin: upstream, https://github.com/Kitware/ParaView/commit/931c779dde8460fe32aa8a3d19956b175b96e4f9 ---- - Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 + - Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 + - Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 + - .../pqStandardViewFrameActionsImplementation.cxx | 1 + - Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 + - .../pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++ - Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 + - Qt/Components/pqChangeInputDialog.cxx | 1 + - Qt/Components/pqCinemaTrackSelection.cxx | 1 + - Qt/Python/pqPythonShell.cxx | 1 + - 10 files changed, 11 insertions(+) - -Index: b/Plugins/SLACTools/pqSLACDataLoadManager.cxx -=================================================================== ---- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx -+++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx -@@ -33,6 +33,7 @@ - #include "vtkSMProperty.h" - #include "vtkSMSourceProxy.h" - -+#include - #include - #include - -Index: b/Qt/ApplicationComponents/pqColorMapEditor.cxx -=================================================================== ---- a/Qt/ApplicationComponents/pqColorMapEditor.cxx -+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx -@@ -59,6 +59,7 @@ - #include - #include - #include -+#include - #include - - class pqColorMapEditor::pqInternals -Index: b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -=================================================================== ---- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -@@ -43,6 +43,7 @@ - #include "vtkSMUncheckedPropertyHelper.h" - - #include -+#include - - class pqDoubleRangeSliderPropertyWidget::pqInternals - { -Index: b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -=================================================================== ---- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -@@ -69,6 +69,7 @@ - #include - #include - #include -+#include - - //----------------------------------------------------------------------------- - pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation( -Index: b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx -=================================================================== ---- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx -+++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx -@@ -49,6 +49,7 @@ - #include "vtkSMPropertyHelper.h" - #include "vtkSMSourceProxy.h" - -+#include - #include - #include - #include -Index: b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -=================================================================== ---- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -@@ -39,6 +39,7 @@ - #include "vtkSMProxy.h" - - #include -+#include - - class pqViewResolutionPropertyWidget::pqInternals - { -Index: b/Qt/Components/pqChangeInputDialog.cxx -=================================================================== ---- a/Qt/Components/pqChangeInputDialog.cxx -+++ b/Qt/Components/pqChangeInputDialog.cxx -@@ -45,6 +45,7 @@ - #include "vtkSMProxy.h" - #include "vtkSmartPointer.h" - -+#include - #include - #include - #include -Index: b/Qt/Components/pqCinemaTrackSelection.cxx -=================================================================== ---- a/Qt/Components/pqCinemaTrackSelection.cxx -+++ b/Qt/Components/pqCinemaTrackSelection.cxx -@@ -30,6 +30,7 @@ - - ========================================================================*/ - #include -+#include - - #include "vtkPVArrayInformation.h" - #include "vtkPVDataInformation.h" diff -Nru paraview-5.4.1+dfsg4/debian/patches/series paraview-5.4.1+dfsg4/debian/patches/series --- paraview-5.4.1+dfsg4/debian/patches/series 2018-08-20 13:41:24.000000000 +0000 +++ paraview-5.4.1+dfsg4/debian/patches/series 2018-09-17 16:59:09.000000000 +0000 @@ -7,5 +7,5 @@ fix_gl2ps_new.patch fix_opengl_arm.patch disable-local-FindMPI.patch -qt_5.11.patch -f9c7e4b01341f45aec55f452b583c544e2557ca4.patch +0001-ENH-Changes-needed-to-support-Qt-5.11.patch +0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch