[Python-modules-commits] r25048 - in packages/matplotlib/trunk/debian (6 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Sun Jun 30 16:53:39 UTC 2013
Date: Sunday, June 30, 2013 @ 16:53:36
Author: morph
Revision: 25048
* debian/patches/*
- refreshed and removed merged patch
Modified:
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.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_bts691960_reintroduce_examples.directory_rcparam.patch
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2013-06-30 12:11:33 UTC (rev 25047)
+++ packages/matplotlib/trunk/debian/changelog 2013-06-30 16:53:36 UTC (rev 25048)
@@ -11,12 +11,14 @@
Closes: #531024
* debian/README.debian
- changed location of user-specific config file
+ * debian/patches/*
+ - refreshed and removed merged patch
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
* Fix typos in README.debian.
- -- Sandro Tosi <morph at debian.org> Mon, 24 Jun 2013 21:55:31 +0200
+ -- Sandro Tosi <morph at debian.org> Sun, 30 Jun 2013 18:53:10 +0200
matplotlib (1.2.0-1) experimental; urgency=low
Modified: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2013-06-30 12:11:33 UTC (rev 25047)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2013-06-30 16:53:36 UTC (rev 25048)
@@ -2,11 +2,9 @@
Forwarded: not-needed
Author: Sandro Tosi <morph at debian.org>
-Index: matplotlib-1.1.0~rc1/lib/matplotlib/__init__.py
-===================================================================
---- 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 @@
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -607,10 +607,12 @@ def _get_data_path():
raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
return path
@@ -20,12 +18,12 @@
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
-@@ -596,7 +598,7 @@
- if os.path.exists(fname): return fname
+@@ -727,7 +729,7 @@ def matplotlib_fname():
+ _get_xdg_config_dir())
+ return fname
-
-- path = get_data_path() # guaranteed to exist or raise
-+ path = '/etc' # guaranteed to exist or raise
+- path = get_data_path() # guaranteed to exist or raise
++ path = '/etc' # guaranteed to exist or raise
fname = os.path.join(path, 'matplotlibrc')
if not os.path.exists(fname):
warnings.warn('Could not find matplotlibrc; using defaults')
Modified: packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2013-06-30 12:11:33 UTC (rev 25047)
+++ packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2013-06-30 16:53:36 UTC (rev 25048)
@@ -1,11 +1,9 @@
Description: minor glitch in draw_markers() description
Author: Jakub Wilk <jwilk at debian.org>
-Index: matplotlib-1.1.0~rc1/doc/api/api_changes.rst
-===================================================================
---- 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 @@
+--- a/doc/api/api_changes.rst
++++ b/doc/api/api_changes.rst
+@@ -919,7 +919,7 @@ New methods:
* :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 2013-06-30 12:11:33 UTC (rev 25047)
+++ packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch 2013-06-30 16:53:36 UTC (rev 25048)
@@ -1,10 +1,8 @@
Description: don't separate param and its argument with a space
-Index: matplotlib-1.1.0~rc1/lib/mpl_toolkits/axes_grid1/axes_divider.py
-===================================================================
---- 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 @@
+--- a/lib/mpl_toolkits/axes_grid1/axes_divider.py
++++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py
+@@ -201,12 +201,12 @@ class Divider(object):
def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
"""
@@ -19,7 +17,7 @@
"""
-@@ -251,12 +251,12 @@
+@@ -253,12 +253,12 @@ class Divider(object):
(:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
specified cell.
@@ -34,7 +32,7 @@
"""
return AxesLocator(self, nx, ny, nx1, ny1)
-@@ -297,12 +297,12 @@
+@@ -299,12 +299,12 @@ class AxesLocator(object):
"""
:param axes_divider: An instance of AxesDivider class.
Deleted: packages/matplotlib/trunk/debian/patches/60_bts691960_reintroduce_examples.directory_rcparam.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_bts691960_reintroduce_examples.directory_rcparam.patch 2013-06-30 12:11:33 UTC (rev 25047)
+++ packages/matplotlib/trunk/debian/patches/60_bts691960_reintroduce_examples.directory_rcparam.patch 2013-06-30 16:53:36 UTC (rev 25048)
@@ -1,81 +0,0 @@
-Description: Reintroduce examples.directory rc parameter
-Forwarded: https://github.com/matplotlib/matplotlib/pull/1479
-Bug-Debian: http://bugs.debian.org/691960
-Author: Sandro Tosi <morph at debian.org>
-
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -825,6 +825,20 @@ Please do not ask for support with these
- # this is the instance used by the matplotlib classes
- rcParams = rc_params()
-
-+if rcParams['examples.directory']:
-+ # paths that are intended to be relative to matplotlib_fname()
-+ # are allowed for the examples.directory parameter.
-+ # However, we will need to fully qualify the path because
-+ # Sphinx requires absolute paths.
-+ if not os.path.isabs(rcParams['examples.directory']):
-+ _basedir, _fname = os.path.split(matplotlib_fname())
-+ # Sometimes matplotlib_fname() can return relative paths,
-+ # Also, using realpath() guarentees that Sphinx will use
-+ # the same path that matplotlib sees (in case of weird symlinks).
-+ _basedir = os.path.realpath(_basedir)
-+ _fullpath = os.path.join(_basedir, rcParams['examples.directory'])
-+ rcParams['examples.directory'] = _fullpath
-+
- rcParamsOrig = rcParams.copy()
-
- rcParamsDefault = RcParams([ (key, default) for key, (default, converter) in \
---- a/lib/matplotlib/cbook.py
-+++ b/lib/matplotlib/cbook.py
-@@ -21,6 +21,7 @@ import traceback
- import warnings
- from weakref import ref, WeakKeyDictionary
-
-+import matplotlib
-
- import numpy as np
- import numpy.ma as ma
-@@ -570,9 +571,17 @@ def get_sample_data(fname, asfileobj=Tru
- `mpl-data/sample_data` directory. If *asfileobj* is `True`
- return a file object, otherwise just a file path.
-
-+ Set the rc parameter examples.directory to the directory where we should
-+ look, if sample_data files are stored in a location different than
-+ default (which is 'mpl-data/sample_data` at the same level of 'matplotlib`
-+ Python module files).
-+
- If the filename ends in .gz, the file is implicitly ungzipped.
- """
-- root = os.path.join(os.path.dirname(__file__), "mpl-data", "sample_data")
-+ if matplotlib.rcParams['examples.directory']:
-+ root = matplotlib.rcParams['examples.directory']
-+ else:
-+ root = os.path.join(os.path.dirname(__file__), "mpl-data", "sample_data")
- path = os.path.join(root, fname)
-
- if asfileobj:
---- a/lib/matplotlib/rcsetup.py
-+++ b/lib/matplotlib/rcsetup.py
-@@ -616,6 +616,9 @@ defaultParams = {
- 'keymap.xscale' : [['k', 'L'], validate_stringlist],
- 'keymap.all_axes' : ['a', validate_stringlist],
-
-+ # sample data
-+ 'examples.directory' : ['', str],
-+
- # Animation settings
- 'animation.writer' : ['ffmpeg', validate_movie_writer],
- 'animation.codec' : ['mpeg4', str],
---- a/matplotlibrc.template
-+++ b/matplotlibrc.template
-@@ -423,6 +423,9 @@ text.hinting_factor : 8 # Specifies the
- #keymap.xscale : L, k # toggle scaling of x-axes ('log'/'linear')
- #keymap.all_axes : a # enable all axes
-
-+# Control location of examples data files
-+examples.directory : /usr/share/matplotlib/sample_data
-+
- ###ANIMATION settings
- #animation.writer : ffmpeg # MovieWriter 'backend' to use
- #animation.codec : mp4 # Codec to use for writing movie
Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series 2013-06-30 12:11:33 UTC (rev 25047)
+++ packages/matplotlib/trunk/debian/patches/series 2013-06-30 16:53:36 UTC (rev 25048)
@@ -2,4 +2,3 @@
20_matplotlibrc_path_search_fix.patch
40_bts608939_draw_markers_description.patch
50_bts608942_spaces_in_param_args.patch
-60_bts691960_reintroduce_examples.directory_rcparam.patch
More information about the Python-modules-commits
mailing list