[Python-modules-commits] r9951 - in packages/matplotlib/trunk/debian (5 files)

[bdrung-guest at users.alioth.debian.org]

    Date: Monday, October 5, 2009 @ 21:48:44
  Author: bdrung-guest
Revision: 9951

* wrote 05-find-tcl-tk-directory.dpatch
* strip not working parts from 10_build_fix.dpatch
* debian/rules
  - refresh clean target

Added:
  packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/00list
  packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2009-10-05 20:04:40 UTC (rev 9950)
+++ packages/matplotlib/trunk/debian/changelog	2009-10-05 21:48:44 UTC (rev 9951)
@@ -1,12 +1,19 @@
 matplotlib (0.99.1.1-1) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * New upstream release
   * debian/control
     - added python-wxgtk2.8-dbg to b-d (needed to build -dbg package)
     - added python-imaging to b-d (needed for -doc package)
 
- -- Sandro Tosi <morph at debian.org>  Mon, 05 Oct 2009 13:24:33 +0200
+  [ Benjamin Drung ]
+  * wrote 05-find-tcl-tk-directory.dpatch
+  * strip not working parts from 10_build_fix.dpatch
+  * debian/rules
+    - refresh clean target
 
+ -- Benjamin Drung <bdrung at ubuntu.com>  Mon, 05 Oct 2009 23:34:40 +0200
+
 matplotlib (0.99.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/matplotlib/trunk/debian/patches/00list
===================================================================
--- packages/matplotlib/trunk/debian/patches/00list	2009-10-05 20:04:40 UTC (rev 9950)
+++ packages/matplotlib/trunk/debian/patches/00list	2009-10-05 21:48:44 UTC (rev 9951)
@@ -1,2 +1,3 @@
+05-find-tcl-tk-directory.dpatch
 10_build_fix.dpatch
 20_matplotlibrc_path_search_fix.dpatch

Added: packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/05-find-tcl-tk-directory.dpatch	2009-10-05 21:48:44 UTC (rev 9951)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-find-tcl-tk-directory.dpatch by Benjamin Drung <bdrung at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Guess the correct directory in Debian/Ubuntu. Replacing all tcl by tk
+## DP: does not lead to a correct directory:
+## DP: /usr/share/tcltk/tcl8.5 -> /usr/share/tktk/tk8.5
+## DP: The correct path is /usr/share/tcltk/tk8.5
+
+ at DPATCH@
+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/10_build_fix.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch	2009-10-05 20:04:40 UTC (rev 9950)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.dpatch	2009-10-05 21:48:44 UTC (rev 9951)
@@ -38,29 +38,3 @@
      'aix5' : ['/usr/local'],
  }
  
-@@ -977,6 +983,10 @@
-         tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
-                                                        '../../include'))
- 
-+    if not os.path.exists(tk_inc):
-+        tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
-+                                               '../../../include/tcl' + tk_ver))
-+
-     if not os.path.exists(os.path.join(tk_inc, 'tk.h')):
-         tk_inc = tcl_inc
- 
-@@ -994,10 +1004,10 @@
-     return tcl_lib, tcl_inc, tk_lib, tk_inc
- 
- def hardcoded_tcl_config():
--    tcl_inc = "/usr/local/include"
--    tk_inc = "/usr/local/include"
--    tcl_lib = "/usr/local/lib"
--    tk_lib = "/usr/local/lib"
-+    tcl_inc = "/usr/include/tcl8.5"
-+    tk_inc = "/usr/include/tcl8.5"
-+    tcl_lib = "/usr/lib"
-+    tk_lib = "/usr/lib"
-     return tcl_lib, tcl_inc, tk_lib, tk_inc
- 
- def add_tk_flags(module):

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2009-10-05 20:04:40 UTC (rev 9950)
+++ packages/matplotlib/trunk/debian/rules	2009-10-05 21:48:44 UTC (rev 9951)
@@ -57,7 +57,10 @@
 
 	# workaround for cleaning the doc ("doc/make.py clean" only runs useless svn-clean)
 	rm -rf doc/build doc/examples
-	rm -f doc/mpl_examples/api/*.png doc/mpl_examples/pylab_examples/*.png
+	rm -f doc/mpl_examples/api/*.png
+	rm -f doc/mpl_examples/pylab_examples/*.png
+	rm -f doc/mpl_examples/pylab_examples/*.pdf
+	rm -f doc/mpl_examples/units/*.png
 	rm -f doc/pyplots/tex_demo.png
 	rm -f doc/_static/matplotlibrc
 	rm -f doc/_templates/gallery.html