[Python-modules-commits] [matplotlib] 03/08: 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 80d5e84fb721f336773d262d491fb7efa9aa2e2a
Merge: 099c121 0131130
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jan 9 15:50:05 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...s800803-disable-the-GitHub-Fork-Me-ribbon.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/_templates/layout.html                         |  6 -----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 6359e59,0000000..7465389
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
- 304fe1390bfcdbc87c384a272ee940224e508769
- 304fe1390bfcdbc87c384a272ee940224e508769
++0131130ce28b1525341bd86c487112ba6560c7cc
++0131130ce28b1525341bd86c487112ba6560c7cc
 +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/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
index 0000000,0000000..8cf5fba
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 0131130ce28b1525341bd86c487112ba6560c7cc Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sat, 9 Jan 2016 15:49:51 +0000
++Subject: bts800803 disable the GitHub Fork Me ribbon
++
++---
++ doc/_templates/layout.html | 6 ------
++ 1 file changed, 6 deletions(-)
++
++diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
++index cb193d0..70f1b99 100644
++--- a/doc/_templates/layout.html
+++++ b/doc/_templates/layout.html
++@@ -188,12 +188,6 @@ color: #11557C;">new updates</a></p>
++ 
++ <link rel="shortcut icon" href="/_static/favicon.ico">
++ 
++-<!-- The "Fork me on github" ribbon -->
++-<img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
++-<map name="ribbonmap">
++-    <area shape="poly" coords="15,0,148,-1,148,135" href="https://github.com/matplotlib/matplotlib" title="Fork me on GitHub" />
++-</map>
++-
++ <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
++ <a href="{{ pathto('index') }}"><img src="{{
++ pathto("_static/logo2.svg", 1) }}" width="540px" border="0" alt="matplotlib"/></a>
diff --cc debian/patches/series
index cffc5c8,0000000..fa1f64e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +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

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