[Python-modules-commits] [python-pysnmp4] 08/11: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-pysnmp4.

commit c218205dd0a5bef1b24e0003c1cadb12bb6877d2
Merge: f35c8ce c2e3edc
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Jul 2 16:05:56 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...Do-not-include-analytics-in-documentation.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/source/.templates/layout.html                 |  3 ---
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index e6d53f7,0000000..af340de
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
- c4be338869467b796fd2fecff2c13ac8563ee08a
- c4be338869467b796fd2fecff2c13ac8563ee08a
++c2e3edc600b3c8548fdb0a9b919ef505b631411f
++c2e3edc600b3c8548fdb0a9b919ef505b631411f
 +c4be338869467b796fd2fecff2c13ac8563ee08a
 +c4be338869467b796fd2fecff2c13ac8563ee08a
 +python-pysnmp4_4.3.2.orig.tar.gz
 +9060d4d80145828470e27bfca931880940f4b468
 +398593
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Do-not-include-analytics-in-documentation.patch
index 0000000,0000000..cdb9016
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Do-not-include-analytics-in-documentation.patch
@@@ -1,0 -1,0 +1,24 @@@
++From c2e3edc600b3c8548fdb0a9b919ef505b631411f Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sat, 2 Jul 2016 16:05:27 +0200
++Subject: Do not include analytics in documentation
++
++---
++ docs/source/.templates/layout.html | 3 ---
++ 1 file changed, 3 deletions(-)
++
++diff --git a/docs/source/.templates/layout.html b/docs/source/.templates/layout.html
++index 0f25e0e76b7e..bada42868146 100644
++--- a/docs/source/.templates/layout.html
+++++ b/docs/source/.templates/layout.html
++@@ -133,10 +133,7 @@
++         <div class="rst-content">
++           {% include "breadcrumbs.html" %}
++           <div role="main" class="document">
++-            {% include "top.html" %}
++             {% block body %}{% endblock %}
++-            {% include "bottom.html" %}
++-            {% include "analytics.html" %}
++           <hr/>
++           </div>
++           {% include "footer.html" %}
diff --cc debian/patches/series
index 0000000,0000000..68469d3
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Do-not-include-analytics-in-documentation.patch

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