[Python-modules-commits] [fabulous] 04/13: merge patched into master

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository fabulous.

commit cab8074e103b71025419e93db86fdaf625fa4a7b
Merge: c03bfa0 412300c
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Aug 14 11:10:39 2016 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...-local-objects.inv-for-intersphinx-mapping.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 docs/conf.py                                        |  4 +++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a6aa1cf,0000000..43082a2
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
- f73ecfce5ddd8d7d404c609914fd4a606537a315
- f73ecfce5ddd8d7d404c609914fd4a606537a315
++412300c7de54e47dd888ca1179bc8f1b0802fb88
++412300c7de54e47dd888ca1179bc8f1b0802fb88
 +4f996274d5b20a7b59ef19d084aa47e89247322e
 +4f996274d5b20a7b59ef19d084aa47e89247322e
 +fabulous_0.1.5+dfsg1.orig.tar.gz
 +bc07574b20e268f3a8730c31ecf9a5b9db466f05
 +30567
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Use-local-objects.inv-for-intersphinx-mapping.patch
index 0000000,0000000..4022a82
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Use-local-objects.inv-for-intersphinx-mapping.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 412300c7de54e47dd888ca1179bc8f1b0802fb88 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 14 Aug 2016 11:10:31 +0200
++Subject: Use local objects.inv for intersphinx mapping
++
++---
++ docs/conf.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index b0af172..3c520d3 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -196,4 +196,6 @@ latex_documents = [
++ 
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++-intersphinx_mapping = {'http://docs.python.org/': None}
+++intersphinx_mapping = {
+++    'python': ('/usr/share/doc/python3-doc/html', None),
+++}
diff --cc debian/patches/series
index cd0e6fe,0000000..e1068ea
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +build_xterm256_ext
 +remove_ez_setup
 +fix_except
++0004-Use-local-objects.inv-for-intersphinx-mapping.patch

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