[Python-modules-commits] [kombu] 03/03: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository kombu.

commit 70abcbcb39e475b4aec2106936b42802c1fafa57
Merge: 490ebb4 caf0036
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Apr 14 09:37:04 2016 +0200

    merge patched into master

 debian/.git-dpm                          |  4 ++--
 debian/patches/0002-No-intersphinx.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 docs/conf.py                             |  1 -
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 95995ca,0000000..522dfd4
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
- 836dfdaaec73f07897e7713363b044783a85ccf4
- 836dfdaaec73f07897e7713363b044783a85ccf4
++caf00369e9bd7e55b9f20f72472b56ae0b070b1d
++caf00369e9bd7e55b9f20f72472b56ae0b070b1d
 +4bb347eb24c6e85f9e055fb545c1387f8a296577
 +4bb347eb24c6e85f9e055fb545c1387f8a296577
 +kombu_3.0.35.orig.tar.gz
 +8dbe83e46e928b9710033399ba0381327948549a
 +381135
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-No-intersphinx.patch
index 0000000,0000000..4ab8b1b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-No-intersphinx.patch
@@@ -1,0 -1,0 +1,24 @@@
++From caf00369e9bd7e55b9f20f72472b56ae0b070b1d Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Thu, 14 Apr 2016 09:36:58 +0200
++Subject: No intersphinx
++
++ Otherwise, there's network access during build.
++Forwarded: not-needed
++Last-Update: 2016-04-13
++---
++ docs/conf.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 84c65e1..62b9946 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -24,7 +24,6 @@ else:
++ 
++ extensions = [
++     'sphinx.ext.autodoc',
++-    'sphinx.ext.intersphinx',
++     'sphinx.ext.coverage',
++     'sphinx.ext.viewcode',
++     'sphinx.ext.pngmath',
diff --cc debian/patches/series
index f9a10c3,0000000..9a2982c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +remove_logo.patch
++0002-No-intersphinx.patch

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