[Python-modules-commits] [matplotlib] 07/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 d7886815bb732139e235e0b58061881ffc7a366c
Merge: 38dce3d 6e26b84
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jan 9 16:51:31 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...0803-remote-the-Google-Analytics-tracking.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/_templates/layout.html                         | 10 --------
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index 943f8d2,0000000..85b3f2b
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
- 94e09e2cb6d51f4a9ef77d76b95586744de1b6a4
- 94e09e2cb6d51f4a9ef77d76b95586744de1b6a4
++6e26b84f9c1de9ac768f94070d36ae381af20bda
++6e26b84f9c1de9ac768f94070d36ae381af20bda
 +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/0007-bts800803-remote-the-Google-Analytics-tracking.patch
index 0000000,0000000..759ce63
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 6e26b84f9c1de9ac768f94070d36ae381af20bda Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sat, 9 Jan 2016 16:51:28 +0000
++Subject: bts800803 remote the Google Analytics tracking
++
++---
++ doc/_templates/layout.html | 10 ----------
++ 1 file changed, 10 deletions(-)
++
++diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
++index e17db11..d653f22 100644
++--- a/doc/_templates/layout.html
+++++ b/doc/_templates/layout.html
++@@ -248,15 +248,5 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
++     </div>
++  {%- endblock %}
++ 
++-<script>
++-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
++-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
++-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
++-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
++-
++-  ga('create', 'UA-55954603-1', 'auto');
++-  ga('send', 'pageview');
++-
++-</script>
++ </body>
++ </html>
diff --cc debian/patches/series
index 5942c27,0000000..c1bc696
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +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

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