[Python-modules-commits] [yarl] 08/11: 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 1dec72aae852aa0004884532f075a8ea73dcc372
Merge: 927e54d 42b9855
Author: Piotr Ożarowski <ozarow at gmail.com>
Date:   Sun Nov 6 22:15:32 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...0003-docs-disable-sidebar_collapse-option.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 68c8fbe,0000000..22885fd
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
- 6b8032106334e5f07be63c7951ce8b1530fa7677
- 6b8032106334e5f07be63c7951ce8b1530fa7677
++42b98554dc04a54dc2f9345909097fa94c2b2abe
++42b98554dc04a54dc2f9345909097fa94c2b2abe
 +816789f28de874763af9c62857db5fd169d6c5b4
 +816789f28de874763af9c62857db5fd169d6c5b4
 +yarl_0.5.3.orig.tar.gz
 +9b974b1d3170d10bcef7ebdbb6bc0adad8021f2f
 +115546
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-docs-disable-sidebar_collapse-option.patch
index 0000000,0000000..918397f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-docs-disable-sidebar_collapse-option.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 42b98554dc04a54dc2f9345909097fa94c2b2abe Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow at gmail.com>
++Date: Sun, 6 Nov 2016 22:14:54 +0100
++Subject: docs: disable sidebar_collapse option
++
++theme packaged in Debian doesn't have this option
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 4599902..3de0fb6 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -168,7 +168,7 @@ html_theme_options = {
++     'body_text': '#482C0A',
++     'sidebar_text': '#49443E',
++     'sidebar_header': '#4B4032',
++-    'sidebar_collapse': False,
+++    #'sidebar_collapse': False,
++ }
++ 
++ # Theme options are theme-specific and customize the look and feel of a theme
diff --cc debian/patches/series
index 3913302,0000000..f8a55c3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-do-not-add-changelog-to-long-description.patch
 +0002-docs-disable-intersphinx.patch
++0003-docs-disable-sidebar_collapse-option.patch

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