[Python-modules-commits] [flask-restful] 12/12: 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 flask-restful.

commit 63f7b86718b5f2f0a7a65144e1b53d7bc6cc04f3
Merge: 5728859 e398c25
Author: Ondřej Nový <onovy at debian.org>
Date:   Sat Aug 13 23:45:43 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...opies-of-object.inv-for-building-document.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       | 10 ++++----
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 01d9feb,0000000..bb5a7b0
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
- 81b0b8d57544dcab9fa1a5e0ac3dc81a2ac4f231
- 81b0b8d57544dcab9fa1a5e0ac3dc81a2ac4f231
++e398c25382eb8479a7f46fc42a05aad9afbbe29f
++e398c25382eb8479a7f46fc42a05aad9afbbe29f
 +90839985ac22066b03cf26576bf553460c71124e
 +90839985ac22066b03cf26576bf553460c71124e
 +flask-restful_0.3.5.orig.tar.gz
 +c701a0a8902557bf51c71c765b9b6b9ec5edaf4e
 +113214
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Use-local-copies-of-object.inv-for-building-document.patch
index 0000000,0000000..af84a1c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Use-local-copies-of-object.inv-for-building-document.patch
@@@ -1,0 -1,0 +1,28 @@@
++From e398c25382eb8479a7f46fc42a05aad9afbbe29f Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sat, 13 Aug 2016 23:41:51 +0200
++Subject: Use local copies of object.inv for building documentation
++
++---
++ docs/conf.py | 10 +++++-----
++ 1 file changed, 5 insertions(+), 5 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 86fafe6..1957254 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -256,9 +256,9 @@ texinfo_documents = [
++ #texinfo_show_urls = 'footnote'
++ 
++ intersphinx_mapping = {
++-  'flask': ('http://flask.pocoo.org/docs/', None),
++-  'werkzeug': ('http://werkzeug.pocoo.org/docs/', None),
++-  'python': ('https://docs.python.org/2/', None),
++-  'python3': ('https://docs.python.org/3/', None),
++-  'six': ('http://pythonhosted.org/six/', None),
+++  'flask': ('/usr/share/doc/python-flask-doc/html', None),
+++  'werkzeug': ('/usr/share/doc/python-werkzeug-doc/html', None),
+++  'python': ('/usr/share/doc/python3-doc/html', None),
+++  'python3': ('/usr/share/doc/python3-doc/html', None),
+++  'six': (None),
++ }
diff --cc debian/patches/series
index a56e3f0,0000000..2480227
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +skip-bad-test
 +remove-external-image
++0003-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/flask-restful.git