[Python-modules-commits] [yarl] 12/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 03d424123dbff1f6d3a91f968b644cb418ba9332
Merge: 0d56439 177308c
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Jun 20 20:17:29 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...ble-privacy-breach-links-in-documentation.patch | 29 +++++++++++++---------
 docs/conf.py                                       | 14 +++++------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --cc debian/.git-dpm
index bbafdb0,0000000..ae8442a
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
- de85e20ff62eed78ca6941bccc60c1d12813d118
- de85e20ff62eed78ca6941bccc60c1d12813d118
++177308c15c23f2644bc0ef40b46e0242f7b5c85c
++177308c15c23f2644bc0ef40b46e0242f7b5c85c
 +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 9b631f0,0000000..5f142c0
mode 100644,000000..100644
--- a/debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
+++ b/debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
@@@ -1,29 -1,0 +1,34 @@@
- From de85e20ff62eed78ca6941bccc60c1d12813d118 Mon Sep 17 00:00:00 2001
++From 177308c15c23f2644bc0ef40b46e0242f7b5c85c 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(-)
++ docs/conf.py | 14 +++++++-------
++ 1 file changed, 7 insertions(+), 7 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 3de0fb6..8fddb60 100644
++index 3de0fb6..e177904 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
- @@ -157,11 +157,11 @@ html_theme_options = {
++@@ -155,13 +155,13 @@ html_theme = 'alabaster'
++ html_theme_options = {
++     'logo': 'yarl-icon-128x128.png',
 +     'description': 'Yet another URL library',
-      'github_user': 'aio-libs',
-      'github_repo': 'yarl',
++-    'github_user': 'aio-libs',
++-    'github_repo': 'yarl',
 +-    'github_button': True,
- +    'github_button': False,
-      'github_type': 'star',
++-    'github_type': 'star',
 +-    'github_banner': True,
 +-    'travis_button': True,
 +-    'codecov_button': True,
- +    'github_banner': False,
- +    'travis_button': False,
- +    'codecov_button': False,
+++#     'github_user': 'aio-libs',
+++#     'github_repo': 'yarl',
+++#     'github_button': True,
+++#     'github_type': 'star',
+++#     'github_banner': True,
+++#     'travis_button': True,
+++#     'codecov_button': True,
 +     'pre_bg': '#FFF6E5',
 +     'note_bg': '#E5ECD1',
 +     'note_border': '#BFCF8C',

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