[Python-modules-commits] [yarl] 10/13: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository yarl.

commit 0d564390790a59c1de21df0f365505cd8fe9b214
Merge: ca99228 de85e20
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Jun 20 20:14:31 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...ble-privacy-breach-links-in-documentation.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  8 +++---
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 767e18d,0000000..bbafdb0
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
- e449195279f3870e3e47fc5575b1cc32b9ee2dee
- e449195279f3870e3e47fc5575b1cc32b9ee2dee
++de85e20ff62eed78ca6941bccc60c1d12813d118
++de85e20ff62eed78ca6941bccc60c1d12813d118
 +33967f05b1739049ccfff67ed06a1a8d2c0fa2a6
 +33967f05b1739049ccfff67ed06a1a8d2c0fa2a6
 +yarl_0.10.3.orig.tar.gz
 +a87472ef1d2161679e4088e258738dde01c4e961
 +127867
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
index 0000000,0000000..9b631f0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
@@@ -1,0 -1,0 +1,29 @@@
++From de85e20ff62eed78ca6941bccc60c1d12813d118 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr at debian.org>
++Date: Tue, 20 Jun 2017 20:13:42 +0200
++Subject: disable privacy breach links in documentation
++
++---
++ docs/conf.py | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 3de0fb6..8fddb60 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -157,11 +157,11 @@ html_theme_options = {
++     'description': 'Yet another URL library',
++     'github_user': 'aio-libs',
++     'github_repo': 'yarl',
++-    'github_button': True,
+++    'github_button': False,
++     'github_type': 'star',
++-    'github_banner': True,
++-    'travis_button': True,
++-    'codecov_button': True,
+++    'github_banner': False,
+++    'travis_button': False,
+++    'codecov_button': False,
++     'pre_bg': '#FFF6E5',
++     'note_bg': '#E5ECD1',
++     'note_border': '#BFCF8C',
diff --cc debian/patches/series
index f8a55c3,0000000..8b3b873
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-do-not-add-changelog-to-long-description.patch
 +0002-docs-disable-intersphinx.patch
 +0003-docs-disable-sidebar_collapse-option.patch
++0004-disable-privacy-breach-links-in-documentation.patch

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