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

[morph at users.alioth.debian.org]

    Date: Saturday, June 12, 2010 @ 07:53:48
  Author: morph
Revision: 13402

* New upstream release
* debian/patches/05-find-tcl-tk-directory.patch
  - removed, now merged upstream

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series
Deleted:
  packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2010-06-12 07:40:10 UTC (rev 13401)
+++ packages/matplotlib/trunk/debian/changelog	2010-06-12 07:53:48 UTC (rev 13402)
@@ -1,3 +1,11 @@
+matplotlib (0.99.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/05-find-tcl-tk-directory.patch
+    - removed, now merged upstream
+
+ -- Sandro Tosi <morph at debian.org>  Sat, 12 Jun 2010 09:53:25 +0200
+
 matplotlib (0.99.1.2-3) unstable; urgency=low
 
   [ Sandro Tosi ]

Deleted: packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch	2010-06-12 07:40:10 UTC (rev 13401)
+++ packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.patch	2010-06-12 07:53:48 UTC (rev 13402)
@@ -1,23 +0,0 @@
-Description: Find tcl/tk directory
- Guess the correct directory in Debian/Ubuntu. Replacing all tcl by tk does not
- lead to a correct directory: /usr/share/tcltk/tcl8.5 -> /usr/share/tktk/tk8.5
- The correct path is /usr/share/tcltk/tk8.5
-Forwarded: Yes
-Author: Benjamin Drung <bdrung at ubuntu.com>
-
-diff -pruN matplotlib-0.99.1.1/setupext.py matplotlib-0.99.1.1.new/setupext.py
---- matplotlib-0.99.1.1/setupext.py	2009-08-23 07:27:32.000000000 +0200
-+++ matplotlib-0.99.1.1.new/setupext.py	2009-10-05 22:46:47.465938277 +0200
-@@ -850,7 +850,11 @@ def query_tcltk():
-         else:
-             tcl_lib_dir = str(tcl.getvar('tcl_library'))
-             # Guess Tk location based on Tcl location
--            tk_lib_dir = tcl_lib_dir.replace('Tcl', 'Tk').replace('tcl', 'tk')
-+            (head, tail) = os.path.split(tcl_lib_dir)
-+            tail = tail.replace('Tcl', 'Tk').replace('tcl', 'tk')
-+            tk_lib_dir = os.path.join(head, tail)
-+            if not os.path.exists(tk_lib_dir):
-+                tk_lib_dir = tcl_lib_dir.replace('Tcl', 'Tk').replace('tcl', 'tk')
-     else:
-         # Obtain Tcl and Tk locations from Tk widget
-         tk.withdraw()

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2010-06-12 07:40:10 UTC (rev 13401)
+++ packages/matplotlib/trunk/debian/patches/series	2010-06-12 07:53:48 UTC (rev 13402)
@@ -1,4 +1,3 @@
-05-find-tcl-tk-directory.patch
 10_build_fix.patch
 20_matplotlibrc_path_search_fix.patch
 30_doc_pass_dpi.patch