[Python-modules-commits] [matplotlib] 05/08: merge patched into master

Sat Jan 9 16:54:15 UTC 2016

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

morph pushed a commit to branch master
in repository matplotlib.

commit 38dce3d89d26a077e9fed0d6b35c4f6545757f8c
Merge: 80d5e84 94e09e2
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jan 9 16:03:48 2016 +0000

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...dont-use-the-Raleway-font-from-the-Google-.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 doc/_templates/layout.html                          |  1 -
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7465389,0000000..943f8d2
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
- 0131130ce28b1525341bd86c487112ba6560c7cc
- 0131130ce28b1525341bd86c487112ba6560c7cc
++94e09e2cb6d51f4a9ef77d76b95586744de1b6a4
++94e09e2cb6d51f4a9ef77d76b95586744de1b6a4
 +6d82424219d3a4cd0abb56028b7aefe94074d759
 +6d82424219d3a4cd0abb56028b7aefe94074d759
 +matplotlib_1.5.1~rc1.orig.tar.gz
 +0876ac5b477c2018ec808ff8b177b5fffa88bfff
 +53376942
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
index 0000000,0000000..901ce6b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 94e09e2cb6d51f4a9ef77d76b95586744de1b6a4 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sat, 9 Jan 2016 16:03:45 +0000
++Subject: bts800803 dont use the Raleway font (from the Google Fonts API)
++
++---
++ doc/_templates/layout.html | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
++index 70f1b99..e17db11 100644
++--- a/doc/_templates/layout.html
+++++ b/doc/_templates/layout.html
++@@ -170,7 +170,6 @@ parents[-1].link|e }}" />
++     {%- endif %}
++ {%- endblock %}
++ {%- block extrahead %} {% endblock %}
++-<link href="http://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
++ 
++   </head>
++   <body>
diff --cc debian/patches/series
index fa1f64e,0000000..5942c27
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +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

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

