[Python-modules-commits] r34496 - in packages/matplotlib/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Monday, October 5, 2015 @ 05:36:54
  Author: morph
Revision: 34496

* debian/patches/10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch
  - upstream patch to fix Qt4/Qt5 detection (tests failed)

Added:
  packages/matplotlib/trunk/debian/patches/10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2015-10-04 19:27:27 UTC (rev 34495)
+++ packages/matplotlib/trunk/debian/changelog	2015-10-05 05:36:54 UTC (rev 34496)
@@ -13,8 +13,10 @@
   * debian/control
     - add cycler to b-d (bin pkgs depends are detected by dh_python2)
     - add ipython to b-d, ipython_console_highlighting is required to build doc
+  * debian/patches/10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch
+    - upstream patch to fix Qt4/Qt5 detection (tests failed)
 
- -- Sandro Tosi <morph at debian.org>  Sun, 04 Oct 2015 20:27:01 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 04 Oct 2015 21:44:13 +0100
 
 matplotlib (1.4.3-1) experimental; urgency=medium
 

Added: packages/matplotlib/trunk/debian/patches/10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch	2015-10-05 05:36:54 UTC (rev 34496)
@@ -0,0 +1,26 @@
+From 10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342 Mon Sep 17 00:00:00 2001
+From: Thomas A Caswell <tcaswell at gmail.com>
+Date: Sun, 4 Oct 2015 15:51:22 -0400
+Subject: [PATCH] FIX: remove incorrect error checking
+
+Currently fails with qt5
+---
+ lib/matplotlib/backends/qt_compat.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
+index 6ce8fd6..326f0f6 100644
+--- a/lib/matplotlib/backends/qt_compat.py
++++ b/lib/matplotlib/backends/qt_compat.py
+@@ -140,11 +140,6 @@ def _getSaveFileName(*args, **kwargs):
+             def _getSaveFileName(*args, **kwargs):
+                 return QtGui.QFileDialog.getSaveFileName(*args, **kwargs), None
+ 
+-    else:
+-        raise RuntimeError("PyQt{4,5} bindings found despite sip importing\n"
+-                           "Please install PyQt4 or PyQt5, uninstall sip or "
+-                           "explicitly set the pyside backend.")
+-
+     # Alias PyQt-specific functions for PySide compatibility.
+     QtCore.Signal = QtCore.pyqtSignal
+     try:

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2015-10-04 19:27:27 UTC (rev 34495)
+++ packages/matplotlib/trunk/debian/patches/series	2015-10-05 05:36:54 UTC (rev 34496)
@@ -6,3 +6,4 @@
 multiarch-tktcl.patch
 #gtk3agg_check_no-multiprocessing.patch
 gtk3cairo_check_no-multiprocessing.patch
+10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch