[Python-modules-commits] [behave] 05/09: 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 behave.

commit 19408f9f9b3e9ba5f31c0f476c92f2f2bd054257
Merge: 0b4f76a ed6df9c
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Jun 13 07:38:23 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...cs-disable-use-of-sphincontrib.cheeseshop.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 063b769,0000000..4607be6
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
- 19d18b7b8dfb63b959de1b648af85d69afea47f6
- 19d18b7b8dfb63b959de1b648af85d69afea47f6
++ed6df9cf0e8522ada8e3eda1d69dfbebc972f271
++ed6df9cf0e8522ada8e3eda1d69dfbebc972f271
 +19d18b7b8dfb63b959de1b648af85d69afea47f6
 +19d18b7b8dfb63b959de1b648af85d69afea47f6
 +behave_1.2.5.orig.tar.bz2
 +80b7bda7f1a1fb2fd275eff419c4574e7173a929
 +348877
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-docs-disable-use-of-sphincontrib.cheeseshop.patch
index 0000000,0000000..13be65f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-docs-disable-use-of-sphincontrib.cheeseshop.patch
@@@ -1,0 -1,0 +1,23 @@@
++From ed6df9cf0e8522ada8e3eda1d69dfbebc972f271 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Tue, 13 Jun 2017 07:38:03 +0200
++Subject: docs: disable use of sphincontrib.cheeseshop
++
++Not available in Debian
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index e108e30138f4..781eff883837 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -30,7 +30,7 @@ extensions = [
++     "sphinx.ext.autodoc",
++     "sphinx.ext.extlinks",
++     # -- PYTHON2 SUPPORT ONLY:
++-    "sphinxcontrib.cheeseshop",
+++    # "sphinxcontrib.cheeseshop",
++ ]
++ # if six.PY2:
++ #     # -- PYTHON2 ONLY: Not ported to python3, yet.
diff --cc debian/patches/series
index 0000000,0000000..5330725
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-docs-disable-use-of-sphincontrib.cheeseshop.patch

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