[Python-modules-commits] r34493 - in packages/matplotlib/trunk/debian (8 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Sun Oct 4 16:25:21 UTC 2015
Date: Sunday, October 4, 2015 @ 16:25:21
Author: morph
Revision: 34493
* debian/patches/*
- refresh/remove patches for new uptream code
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/70_bts720549_try_StayPuft_for_xkcd.patch
packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch
packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch
packages/matplotlib/trunk/debian/patches/series
Deleted:
packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/changelog 2015-10-04 16:25:21 UTC (rev 34493)
@@ -8,8 +8,10 @@
Barry Warsaw for the report and patch; Closes: #792310
* debian/copyright
- updated for new upstream code
+ * debian/patches/*
+ - refresh/remove patches for new uptream code
- -- Sandro Tosi <morph at debian.org> Sun, 04 Oct 2015 02:29:49 +0100
+ -- Sandro Tosi <morph at debian.org> Sun, 04 Oct 2015 03:08:32 +0100
matplotlib (1.4.3-1) experimental; urgency=medium
Modified: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2015-10-04 16:25:21 UTC (rev 34493)
@@ -4,11 +4,11 @@
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
-@@ -653,10 +653,12 @@ def _get_data_path():
- raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
+@@ -681,10 +681,12 @@ def _get_data_path():
return path
-- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
+ _file = _decode_filesystem_path(__file__)
+- path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
+ path = '/usr/share/matplotlib/mpl-data'
if os.path.isdir(path):
return path
@@ -18,7 +18,7 @@
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
-@@ -777,7 +779,7 @@ def matplotlib_fname():
+@@ -812,7 +814,7 @@ def matplotlib_fname():
home, '.matplotlib', 'matplotlibrc')
return fname
Modified: packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2015-10-04 16:25:21 UTC (rev 34493)
@@ -3,7 +3,7 @@
--- a/doc/api/api_changes.rst
+++ b/doc/api/api_changes.rst
-@@ -1143,7 +1143,7 @@ New methods:
+@@ -1545,7 +1545,7 @@ New methods:
* :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
trans, rgbFace)
Modified: packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch 2015-10-04 16:25:21 UTC (rev 34493)
@@ -8,7 +8,7 @@
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lib/matplotlib/pyplot.py
+++ b/lib/matplotlib/pyplot.py
-@@ -300,7 +300,7 @@ def xkcd(scale=1, length=100, randomness
+@@ -392,7 +392,7 @@ def xkcd(scale=1, length=100, randomness
from matplotlib import patheffects
context = rc_context()
try:
Deleted: packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/bts613818_use_system_pycxx.patch 2015-10-04 16:25:21 UTC (rev 34493)
@@ -1,37 +0,0 @@
-Description: Enable usage of PyCXX on Py3k too
- Given how PyCXX has been packaged in Debian, we can use the py2 and py3 version
- with matplotlib.
-Author: Sandro Tosi <morph at debian.org>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/613818
-Forwarded: not-needed
-Last-Update: 2015-02-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/setupext.py
-+++ b/setupext.py
-@@ -840,15 +840,15 @@ class CXX(SetupPackage):
- name = 'pycxx'
-
- def check(self):
-- if PY3:
-- # There is no version of PyCXX in the wild that will work
-- # with Python 3.x and matplotlib, since they lack support
-- # for the buffer object.
-- self.__class__.found_external = False
-- return ("Official versions of PyCXX are not compatible "
-- "with matplotlib on Python 3.x, since they lack "
-- "support for the buffer object. Using local "
-- "copy")
-+ #if PY3:
-+ # # There is no version of PyCXX in the wild that will work
-+ # # with Python 3.x and matplotlib, since they lack support
-+ # # for the buffer object.
-+ # self.__class__.found_external = False
-+ # return ("Official versions of PyCXX are not compatible "
-+ # "with matplotlib on Python 3.x, since they lack "
-+ # "support for the buffer object. Using local "
-+ # "copy")
-
- self.__class__.found_external = True
- old_stdout = sys.stdout
Modified: packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch 2015-10-04 16:25:21 UTC (rev 34493)
@@ -1,6 +1,6 @@
--- a/setupext.py
+++ b/setupext.py
-@@ -1740,7 +1740,10 @@ class BackendGtk3Agg(OptionalBackendPack
+@@ -1751,7 +1751,10 @@ class BackendGtk3Agg(OptionalBackendPack
def check_requirements(self):
if 'TRAVIS' in os.environ:
raise CheckFailed("Can't build with Travis")
Modified: packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch 2015-10-04 16:25:21 UTC (rev 34493)
@@ -5,7 +5,7 @@
--- a/setupext.py
+++ b/setupext.py
-@@ -1391,13 +1391,16 @@ class BackendTkAgg(OptionalBackendPackag
+@@ -1403,13 +1403,16 @@ class BackendTkAgg(OptionalBackendPackag
except ImportError:
return None
Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series 2015-10-04 13:25:14 UTC (rev 34492)
+++ packages/matplotlib/trunk/debian/patches/series 2015-10-04 16:25:21 UTC (rev 34493)
@@ -6,4 +6,3 @@
multiarch-tktcl.patch
#gtk3agg_check_no-multiprocessing.patch
gtk3cairo_check_no-multiprocessing.patch
-bts613818_use_system_pycxx.patch
More information about the Python-modules-commits
mailing list