[Python-modules-commits] [matplotlib] 02/04: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository matplotlib.

commit eb61341bb3eee31e9bcba0745b4c6937261fb594
Merge: dae657f 2fa7c27
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jan 21 21:34:40 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...9-Add-a-newline-separator-in-fc-list-call.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/matplotlib/font_manager.py                     |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index d97d5c4,0000000..6f30137
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3143116a701ee9039e385265cf854f9da669abac
- 3143116a701ee9039e385265cf854f9da669abac
++2fa7c27b825af1954e6077bd8c3da5c767aa8b6a
++2fa7c27b825af1954e6077bd8c3da5c767aa8b6a
 +e56d16e832c34e4e84834585724e4b192f36cfd8
 +e56d16e832c34e4e84834585724e4b192f36cfd8
 +matplotlib_2.0.0.orig.tar.gz
 +fdec09942507ad4d0c41a608ff886d66176b505c
 +52201231
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0009-Add-a-newline-separator-in-fc-list-call.patch
index 0000000,0000000..0e7cbca
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-Add-a-newline-separator-in-fc-list-call.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 2fa7c27b825af1954e6077bd8c3da5c767aa8b6a Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= <jks at iki.fi>
++Date: Sat, 21 Jan 2017 21:50:21 +0200
++Subject: Add a newline separator in fc-list call
++
++Fixes #7906.
++---
++ lib/matplotlib/font_manager.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
++index 3084410..213faee 100644
++--- a/lib/matplotlib/font_manager.py
+++++ b/lib/matplotlib/font_manager.py
++@@ -281,7 +281,7 @@ def _call_fc_list():
++         'This may take a moment.'))
++     timer.start()
++     try:
++-        out = subprocess.check_output([str('fc-list'), '--format=%{file}'])
+++        out = subprocess.check_output([str('fc-list'), '--format=%{file}\\n'])
++     except (OSError, subprocess.CalledProcessError):
++         return []
++     finally:
diff --cc debian/patches/series
index 2c17753,0000000..aac89c6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
 +20_matplotlibrc_path_search_fix.patch
 +70_bts720549_try_StayPuft_for_xkcd.patch
 +multiarch-tktcl.patch
 +gtk3cairo_check_no-multiprocessing.patch
 +0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
 +0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
 +0007-bts800803-remote-the-Google-Analytics-tracking.patch
 +0008-Increase-test-tollerance.patch
++0009-Add-a-newline-separator-in-fc-list-call.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git