[SCM] Paraview packaging branch, master, updated. debian/3.14.1-7-3-ga807bc9

Anton Gladky gladky.anton at gmail.com
Thu Oct 25 19:46:14 UTC 2012


The following commit has been merged in the master branch:
commit a807bc9a6076ddb1a16a1f8e7f97a3b5ec9518d6
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Oct 25 21:45:34 2012 +0200

    Disable warning messages on startup (Ubuntu).

diff --git a/debian/patches/disable.dbus.warnings.patch b/debian/patches/disable.dbus.warnings.patch
new file mode 100644
index 0000000..152ca80
--- /dev/null
+++ b/debian/patches/disable.dbus.warnings.patch
@@ -0,0 +1,37 @@
+commit 803d85bea18f9469a88374e9e7d1b4a08160cbec
+Author: Utkarsh Ayachit <utkarsh.ayachit at kitware.com>
+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 --git a/debian/patches/series b/debian/patches/series
index 646fe61..7f5b59f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ 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

-- 
Paraview packaging



More information about the debian-science-commits mailing list