diff -Nru paraview-3.14.1/debian/changelog paraview-3.14.1/debian/changelog --- paraview-3.14.1/debian/changelog 2012-04-18 01:49:46.000000000 +0200 +++ paraview-3.14.1/debian/changelog 2012-10-25 21:12:42.000000000 +0200 @@ -1,3 +1,10 @@ +paraview (3.14.1-1ubuntu2) precise; urgency=low + + * Fix crash in STL ascii reader. + * Skip warning messages on startup. (Closes: LP: #995949) + + -- Anton Gladky Thu, 25 Oct 2012 21:09:08 +0200 + paraview (3.14.1-1ubuntu1) precise; urgency=low * Merge from Debian. Remaining changes: diff -Nru paraview-3.14.1/debian/patches/disable.dbus.warnings.patch paraview-3.14.1/debian/patches/disable.dbus.warnings.patch --- paraview-3.14.1/debian/patches/disable.dbus.warnings.patch 1970-01-01 01:00:00.000000000 +0100 +++ paraview-3.14.1/debian/patches/disable.dbus.warnings.patch 2012-10-25 17:12:20.000000000 +0200 @@ -0,0 +1,37 @@ +commit 803d85bea18f9469a88374e9e7d1b4a08160cbec +Author: Utkarsh Ayachit +Date: Fri May 25 23:31:20 2012 -0400 + + Skipping warning messages seen in Ubuntu. + + We're getting warning message on Ubuntu. Skipping these. + + Change-Id: I70c474aa2d6490327f34eb1e4440dbf55db91007 + +diff --git a/Qt/Core/pqOutputWindow.cxx b/Qt/Core/pqOutputWindow.cxx +index 82376f5..c6f02d9 100644 +--- a/Qt/Core/pqOutputWindow.cxx ++++ b/Qt/Core/pqOutputWindow.cxx +@@ -87,7 +87,7 @@ void pqOutputWindow::onDisplayWarningText(const QString& text) + { + if ( + text.contains("QEventDispatcherUNIX::unregisterTimer", Qt::CaseSensitive) || +- text.contains("looking for 'HistogramView") || ++ text.contains("looking for 'HistogramView") || + text.contains("(looking for 'XYPlot") || + text.contains("Unrecognised OpenGL version") + ) +@@ -127,8 +127,11 @@ void pqOutputWindow::onDisplayGenericWarningText(const QString& text) + void pqOutputWindow::onDisplayErrorText(const QString& text) + { + if ( +- text.contains("Unrecognised OpenGL version") +- ) ++ text.contains("Unrecognised OpenGL version") || ++/* Skip DBusMenuExporterPrivate errors. These, I suspect, are due to ++ * repeated menu actions in the menus. */ ++ text.contains("DBusMenuExporterPrivate") || ++ text.contains("DBusMenuExporterDBus") ) + { + return; + } diff -Nru paraview-3.14.1/debian/patches/fix_STL_reader.patch paraview-3.14.1/debian/patches/fix_STL_reader.patch --- paraview-3.14.1/debian/patches/fix_STL_reader.patch 1970-01-01 01:00:00.000000000 +0100 +++ paraview-3.14.1/debian/patches/fix_STL_reader.patch 2012-10-25 08:24:56.000000000 +0200 @@ -0,0 +1,30 @@ +Description: STL ascii reader was report failures prematurely. +Author: Utkarsh Ayachit +Reviewed-by: Anton Gladky +Bug: http://paraview.org/Bug/view.php?id=13101 +Applied-Upstream: http://review.source.kitware.com/#/c/5242/1/IO/vtkSTLReader.cxx +Last-Update: 2012-10-25 + +--- a/VTK/IO/vtkSTLReader.cxx ++++ b/VTK/IO/vtkSTLReader.cxx +@@ -442,12 +442,15 @@ + { + if (!fgets(line, 255, fp)) + { +- vtkErrorMacro ("STLReader error reading file: " << this->FileName +- << " Premature EOF while reading end solid."); +- fclose(fp); +- return 0; ++ done = feof(fp); ++ if (!done) ++ { ++ vtkErrorMacro ("STLReader error reading file: " << this->FileName ++ << " Premature EOF while reading end solid."); ++ fclose(fp); ++ return 0; ++ } + } +- + done = feof(fp); + } + diff -Nru paraview-3.14.1/debian/patches/series paraview-3.14.1/debian/patches/series --- paraview-3.14.1/debian/patches/series 2012-04-17 23:19:51.000000000 +0200 +++ paraview-3.14.1/debian/patches/series 2012-10-25 17:12:20.000000000 +0200 @@ -8,3 +8,5 @@ kwprocessxml_rpath.patch fix_format_not_a_string_FTBFS.patch workaround_strict-aliasing_in_mpi4py_MPI.patch +fix_STL_reader.patch +disable.dbus.warnings.patch