[Python-modules-commits] [python-werkzeug] 02/05: 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 python-werkzeug.

commit ae027a751133e137a4511fd155d06286b1b525ad
Merge: e2d3247 e5ee65d
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Jul 11 07:12:26 2016 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...copies-of-object.inv-for-building-document.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 docs/conf.py                                        |  3 +--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 7866278,0000000..4b08aff
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
- 8b5661e94696030b7ff471f3a7829738908dbb04
- 8b5661e94696030b7ff471f3a7829738908dbb04
++e5ee65d2f4999de8d9c7481983dfc40bcd1ea90c
++e5ee65d2f4999de8d9c7481983dfc40bcd1ea90c
 +7e274781319973d4190701c37d48aca05a44d61d
 +7e274781319973d4190701c37d48aca05a44d61d
 +python-werkzeug_0.11.10+dfsg1.orig.tar.gz
 +9c96dfdb374e89f1d1e9d1fa0666498def69a699
 +1086483
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
index 0000000,0000000..425c606
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
@@@ -1,0 -1,0 +1,21 @@@
++From e5ee65d2f4999de8d9c7481983dfc40bcd1ea90c Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Mon, 11 Jul 2016 07:11:44 +0200
++Subject: Use local copies of object.inv for building documentation
++
++---
++ docs/conf.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index e2d4e0d..cbbbbb6 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -209,6 +209,5 @@ latex_use_modindex = False
++ 
++ # Example configuration for intersphinx: refer to the Python standard library.
++ intersphinx_mapping = {
++-    'http://docs.python.org/dev': None,
++-    'http://www.sqlalchemy.org/docs/05': None
+++    'py': ('/usr/share/doc/python-doc/html', None),
++ }
diff --cc debian/patches/series
index 509757b,0000000..f15dff3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +drop_ubuntu_font.patch
++0002-Use-local-copies-of-object.inv-for-building-document.patch

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