[Python-modules-commits] r18735 - in packages/matplotlib/trunk/debian (10 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Mon Sep 26 21:50:35 UTC 2011
Date: Monday, September 26, 2011 @ 21:50:33
Author: morph
Revision: 18735
* debian/patches/*
- updated/deleted/refreshed as per new code
Modified:
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/patches/10_build_fix.patch
packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch
packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch
packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch
packages/matplotlib/trunk/debian/patches/series
Deleted:
packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch
packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch
packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/changelog 2011-09-26 21:50:33 UTC (rev 18735)
@@ -7,8 +7,10 @@
- install debug files where gdb looks for them
* debian/copyright
- updated to new release
+ * debian/patches/*
+ - updated/deleted/refreshed as per new code
- -- Sandro Tosi <morph at debian.org> Mon, 26 Sep 2011 23:02:36 +0200
+ -- Sandro Tosi <morph at debian.org> Mon, 26 Sep 2011 23:47:21 +0200
matplotlib (1.0.1-3) unstable; urgency=low
Modified: packages/matplotlib/trunk/debian/patches/10_build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -3,11 +3,11 @@
Author: Sandro Tosi <morph at debian.org>
Last-Update: 2010-02-06
-Index: matplotlib-1.0~rc1/setupext.py
+Index: matplotlib-1.1.0~rc1/setupext.py
===================================================================
---- matplotlib-1.0~rc1.orig/setupext.py 2010-06-07 15:11:57.000000000 +0200
-+++ matplotlib-1.0~rc1/setupext.py 2010-06-30 20:05:25.676158843 +0200
-@@ -49,12 +49,12 @@
+--- matplotlib-1.1.0~rc1.orig/setupext.py 2011-09-24 17:08:27.000000000 +0200
++++ matplotlib-1.1.0~rc1/setupext.py 2011-09-26 23:37:43.195196916 +0200
+@@ -50,13 +50,13 @@
basedir = {
'win32' : ['win32_static',],
@@ -16,17 +16,19 @@
- 'linux2-mips' : ['/usr/local', '/usr'],
- 'linux2-sparc' : ['/usr/local', '/usr'],
- 'linux2' : ['/usr/local', '/usr'],
+- 'linux3' : ['/usr/local', '/usr'],
- 'linux' : ['/usr/local', '/usr',],
+ 'linux2-alpha' : ['/usr'],
+ 'linux2-hppa' : ['/usr'],
+ 'linux2-mips' : ['/usr'],
+ 'linux2-sparc' : ['/usr'],
+ 'linux2' : ['/usr'],
++ 'linux3' : ['/usr'],
+ 'linux' : ['/usr',],
'cygwin' : ['/usr/local', '/usr',],
'_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
'/usr', '/sw'],
-@@ -69,10 +69,10 @@
+@@ -71,10 +71,10 @@
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
Modified: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -2,11 +2,11 @@
Forwarded: not-needed
Author: Sandro Tosi <morph at debian.org>
-Index: matplotlib-1.0~rc1/lib/matplotlib/__init__.py
+Index: matplotlib-1.1.0~rc1/lib/matplotlib/__init__.py
===================================================================
---- matplotlib-1.0~rc1.orig/lib/matplotlib/__init__.py 2010-06-29 15:30:11.000000000 +0200
-+++ matplotlib-1.0~rc1/lib/matplotlib/__init__.py 2010-07-01 18:48:46.494542076 +0200
-@@ -489,10 +489,12 @@
+--- matplotlib-1.1.0~rc1.orig/lib/matplotlib/__init__.py 2011-09-24 17:08:26.000000000 +0200
++++ matplotlib-1.1.0~rc1/lib/matplotlib/__init__.py 2011-09-26 23:45:59.369692360 +0200
+@@ -485,10 +485,12 @@
raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
return path
@@ -20,7 +20,7 @@
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
-@@ -600,7 +602,7 @@
+@@ -596,7 +598,7 @@
if os.path.exists(fname): return fname
Modified: packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -1,13 +1,13 @@
Description: disable download of sample data (used to run examples)
Author: Benjamin Gamari <bgamari.foss at gmail.com>
-Index: matplotlib-1.0.1/matplotlibrc.template
+Index: matplotlib-1.1.0~rc1/matplotlibrc.template
===================================================================
---- matplotlib-1.0.1.orig/matplotlibrc.template 2011-01-01 21:49:44.000000000 -0500
-+++ matplotlib-1.0.1/matplotlibrc.template 2011-01-01 22:13:35.720384573 -0500
-@@ -377,5 +377,5 @@
- # where you have a checkout of
- # https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
+--- matplotlib-1.1.0~rc1.orig/matplotlibrc.template 2011-09-24 17:08:27.000000000 +0200
++++ matplotlib-1.1.0~rc1/matplotlibrc.template 2011-09-26 23:46:09.712993921 +0200
+@@ -404,5 +404,5 @@
+ # examples.download to False and examples.directory to the directory
+ # where you have a checkout of https://github.com/matplotlib/sample_data
-#examples.download : True # False to bypass downloading mechanism
-#examples.directory : '' # directory to look in if download is false
Modified: packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -1,11 +1,11 @@
Description: minor glitch in draw_markers() description
Author: Jakub Wilk <jwilk at debian.org>
-Index: matplotlib-1.0.1/doc/api/api_changes.rst
+Index: matplotlib-1.1.0~rc1/doc/api/api_changes.rst
===================================================================
---- matplotlib-1.0.1.orig/doc/api/api_changes.rst 2011-01-12 23:54:37.130685365 +0100
-+++ matplotlib-1.0.1/doc/api/api_changes.rst 2011-01-12 23:54:54.886682489 +0100
-@@ -540,7 +540,7 @@
+--- matplotlib-1.1.0~rc1.orig/doc/api/api_changes.rst 2011-09-24 17:08:26.000000000 +0200
++++ matplotlib-1.1.0~rc1/doc/api/api_changes.rst 2011-09-26 23:46:20.508264962 +0200
+@@ -569,7 +569,7 @@
* :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
trans, rgbFace)
Modified: packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -1,11 +1,11 @@
Description: don't separate param and its argument with a space
-Index: matplotlib-1.0.1/lib/mpl_toolkits/axes_grid1/axes_divider.py
+Index: matplotlib-1.1.0~rc1/lib/mpl_toolkits/axes_grid1/axes_divider.py
===================================================================
---- matplotlib-1.0.1.orig/lib/mpl_toolkits/axes_grid1/axes_divider.py 2011-01-13 19:25:40.413682190 +0100
-+++ matplotlib-1.0.1/lib/mpl_toolkits/axes_grid1/axes_divider.py 2011-01-13 18:59:00.990682216 +0100
-@@ -172,12 +172,12 @@
- def locate(self, nx, ny, nx1=None, ny1=None, renderer=None):
+--- matplotlib-1.1.0~rc1.orig/lib/mpl_toolkits/axes_grid1/axes_divider.py 2011-09-24 17:08:27.000000000 +0200
++++ matplotlib-1.1.0~rc1/lib/mpl_toolkits/axes_grid1/axes_divider.py 2011-09-26 23:46:30.091617839 +0200
+@@ -199,12 +199,12 @@
+ def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
"""
- :param nx, nx1: Integers specifying the column-position of the
@@ -19,7 +19,7 @@
"""
-@@ -222,12 +222,12 @@
+@@ -251,12 +251,12 @@
(:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
specified cell.
@@ -34,7 +34,7 @@
"""
return AxesLocator(self, nx, ny, nx1, ny1)
-@@ -242,12 +242,12 @@
+@@ -297,12 +297,12 @@
"""
:param axes_divider: An instance of AxesDivider class.
Deleted: packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -1,15 +0,0 @@
-Description: obtain output format information even if it's a unicode string
-
-Index: matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py
-===================================================================
---- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py 2011-01-06 14:48:13.000000000 +0100
-+++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py 2011-01-13 23:50:58.838682411 +0100
-@@ -346,7 +346,7 @@
- del options['nofigs']
-
- formats = setup.config.plot_formats
-- if type(formats) == str:
-+ if isinstance(formats, basestring):
- formats = eval(formats)
-
- fname = os.path.basename(plot_path)
Deleted: packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/70_search_new_tkdir.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -1,39 +0,0 @@
-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
Deleted: packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch 2011-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/80_fix_tkinter_version_detection.patch 2011-09-26 21:50:33 UTC (rev 18735)
@@ -1,30 +0,0 @@
-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-09-26 21:04:37 UTC (rev 18734)
+++ packages/matplotlib/trunk/debian/patches/series 2011-09-26 21:50:33 UTC (rev 18735)
@@ -3,6 +3,3 @@
30_disable_sample_downloads.patch
40_bts608939_draw_markers_description.patch
50_bts608942_spaces_in_param_args.patch
-60_doc_output_format.patch
-70_search_new_tkdir.patch
-80_fix_tkinter_version_detection.patch
More information about the Python-modules-commits
mailing list