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

[morph at users.alioth.debian.org]

    Date: Monday, July 11, 2011 @ 18:52:58
  Author: morph
Revision: 17805

* debian/patches/80_fix_tkinter_version_detection.patch
  - fix tkinter version detection; Closes: #632963

Added:
  packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2011-07-10 21:04:32 UTC (rev 17804)
+++ packages/matplotlib/trunk/debian/changelog	2011-07-11 18:52:58 UTC (rev 17805)
@@ -1,3 +1,10 @@
+matplotlib (1.0.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/80_fix_tkinter_version_detection.patch
+    - fix tkinter version detection; Closes: #632963
+
+ -- Sandro Tosi <morph at debian.org>  Mon, 11 Jul 2011 20:49:23 +0200
+
 matplotlib (1.0.1-2) unstable; urgency=low
 
   * Upload to unstable

Added: packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch	2011-07-11 18:52:58 UTC (rev 17805)
@@ -0,0 +1,30 @@
+From 04b4e509197802b7753c1e10b70f07dbecc2d89e Mon Sep 17 00:00:00 2001
+From: Darren Dale <dsdale24 at gmail.com>
+Date: Sun, 5 Jun 2011 08:25:30 -0400
+Subject: [PATCH] work around bad Tkinter version report
+
+---
+ setupext.py |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 6d041c9..5af214c 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -843,8 +843,12 @@ def check_for_tk():
+                 gotit = False
+ 
+     if gotit:
++        try:
++            tk_v = Tkinter.__version__.split()[-2]
++        except IndexError:
++            tk_v = 'version not identified'
+         print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
+-                     (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion))
++                     (tk_v, Tkinter.TkVersion, Tkinter.TclVersion))
+     else:
+         print_status("Tkinter", "no")
+     if explanation is not None:
+-- 
+1.7.5.4
+

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2011-07-10 21:04:32 UTC (rev 17804)
+++ packages/matplotlib/trunk/debian/patches/series	2011-07-11 18:52:58 UTC (rev 17805)
@@ -5,3 +5,4 @@
 50_bts608942_spaces_in_param_args.patch
 60_doc_output_format.patch
 70_search_new_tkdir.patch
+80_fix_tkinter_version_detection.patch