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

[morph at users.alioth.debian.org]

    Date: Friday, May 6, 2011 @ 23:24:48
  Author: morph
Revision: 16915

* debian/patches/70_search_new_tkdir.patch
  - added patch to look for the updated location of 'tkConfig.sh' script;
    thanks to Julian Taylor for the report and patch; Closes: #621700

Added:
  packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.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-05-06 22:25:45 UTC (rev 16914)
+++ packages/matplotlib/trunk/debian/changelog	2011-05-06 23:24:48 UTC (rev 16915)
@@ -6,8 +6,11 @@
       Rivera for the analysis; Closes: #625150
   * debian/rules
     - remove verbose logging for debhelper
+  * debian/patches/70_search_new_tkdir.patch
+    - added patch to look for the updated location of 'tkConfig.sh' script;
+      thanks to Julian Taylor for the report and patch; Closes: #621700
 
- -- Sandro Tosi <morph at debian.org>  Sat, 07 May 2011 00:23:45 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 07 May 2011 00:46:48 +0200
 
 matplotlib (1.0.1-1) experimental; urgency=low
 

Added: packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch	2011-05-06 23:24:48 UTC (rev 16915)
@@ -0,0 +1,39 @@
+Description: check new path of tcl/tkConfig.sh
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/matplotlib/+bug/752647
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3279844&group_id=80706&atid=560720
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+
+version 8.5.9-2 of tcl and tk moved the tcl/tkConfig.sh
+to /usr/lib/tcl8.5 and /usr/lib/tk8.5
+
+--- matplotlib-1.0.1/setupext.py	2011-04-08 00:09:42.000000000 +0200
++++ matplotlib-1.0.1patched/setupext.py	2011-04-08 00:09:22.000000000 +0200
+@@ -893,15 +893,20 @@
+     return TCL_TK_CACHE
+ 
+ def parse_tcl_config(tcl_lib_dir, tk_lib_dir):
+-    # This is where they live on Ubuntu Hardy (at least)
+-    tcl_config = os.path.join(tcl_lib_dir, "tclConfig.sh")
+-    tk_config = os.path.join(tk_lib_dir, "tkConfig.sh")
++    import Tkinter
++    tcl_poss = [tcl_lib_dir,
++                "/usr/lib/tcl"+str(Tkinter.TclVersion),
++                "/usr/lib"]
++    tk_poss = [tk_lib_dir,
++               "/usr/lib/tk"+str(Tkinter.TkVersion),
++               "/usr/lib"]
++    for ptcl, ptk in zip(tcl_poss, tk_poss):
++        tcl_config = os.path.join(ptcl, "tclConfig.sh")
++        tk_config = os.path.join(ptk, "tkConfig.sh")
++        if (os.path.exists(tcl_config) and os.path.exists(tk_config)):
++            break
+     if not (os.path.exists(tcl_config) and os.path.exists(tk_config)):
+-        # This is where they live on RHEL4 (at least)
+-        tcl_config = "/usr/lib/tclConfig.sh"
+-        tk_config = "/usr/lib/tkConfig.sh"
+-        if not (os.path.exists(tcl_config) and os.path.exists(tk_config)):
+-            return None
++        return None
+ 
+     # These files are shell scripts that set a bunch of
+     # environment variables.  To actually get at the

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2011-05-06 22:25:45 UTC (rev 16914)
+++ packages/matplotlib/trunk/debian/patches/series	2011-05-06 23:24:48 UTC (rev 16915)
@@ -4,3 +4,4 @@
 40_bts608939_draw_markers_description.patch
 50_bts608942_spaces_in_param_args.patch
 60_doc_output_format.patch
+70_search_new_tkdir.patch