[Python-modules-commits] [python-django] 01/01: Use local sphinx sources

[Brian May]

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

bam pushed a commit to branch debian/master
in repository python-django.

commit 249c1430e4bdf7e910d24b9383b0957733caf281
Author: Brian May <bam at debian.org>
Date:   Sat Jun 24 17:17:37 2017 +1000

    Use local sphinx sources
---
 debian/changelog                                   |  6 +++++
 debian/control                                     |  5 ++++
 ...e-locally-installed-documentation-sources.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7732551..71c7040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-django (1:1.11.2-3) UNRELEASED; urgency=medium
+
+  * Use locally installed intersphinx mapping sources. Closes: #852512.
+
+ -- Brian May <bam at debian.org>  Sat, 24 Jun 2017 17:16:53 +1000
+
 python-django (1:1.11.2-2) unstable; urgency=medium
 
   * Upload (LTS) release to unstable.
diff --git a/debian/control b/debian/control
index c682404..3eb7f92 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,11 @@ Build-Depends:
  python3-tblib <!nocheck>,
  python3-tz <!nocheck>,
  python3-yaml  <!nocheck>,
+ python-doc <!nocheck>,
+ sphinx-doc <!nocheck>,
+ python-six-doc <!nocheck>,
+ python-django-formtools-doc <!nocheck>,
+ python-psycopg2-doc <!nocheck>,
 Build-Depends-Indep:
  libjs-jquery,
 Homepage: http://www.djangoproject.com/
diff --git a/debian/patches/0004-Use-locally-installed-documentation-sources.patch b/debian/patches/0004-Use-locally-installed-documentation-sources.patch
new file mode 100644
index 0000000..352acb2
--- /dev/null
+++ b/debian/patches/0004-Use-locally-installed-documentation-sources.patch
@@ -0,0 +1,29 @@
+From: Brian May <bam at debian.org>
+Date: Sat, 24 Jun 2017 17:05:58 +1000
+Subject: Use locally installed documentation sources
+
+---
+ docs/conf.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index ceb935f..3c8c1c1 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -138,11 +138,11 @@ pygments_style = 'trac'
+ # Links to Python's docs should reference the most recent version of the 3.x
+ # branch, which is located at this URL.
+ intersphinx_mapping = {
+-    'python': ('https://docs.python.org/3/', None),
+-    'sphinx': ('http://sphinx-doc.org/', None),
+-    'six': ('https://pythonhosted.org/six/', None),
+-    'formtools': ('https://django-formtools.readthedocs.io/en/latest/', None),
+-    'psycopg2': ('http://initd.org/psycopg/docs/', None),
++    'python': ('/usr/share/doc/python-doc/html/', None),
++    'sphinx': ('/usr/share/doc/sphinx-doc/html/', None),
++    'six': ('/usr/share/doc/python-six-doc/html/', None),
++    'formtools': ('/usr/share/doc/python-django-formtools-doc/html/', None),
++    'psycopg2': ('/usr/share/doc/python-psycopg2-doc/html/', None),
+ }
+ 
+ # Python's docs don't change every week.
diff --git a/debian/patches/series b/debian/patches/series
index 88a0613..7cc73f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable-sources-in-sphinxdoc.diff
 0002-use_debian_geoip_database_as_default.diff
 0003-Fixed-test_middleware_classes_headers-if-Django-sour.patch
+0004-Use-locally-installed-documentation-sources.patch

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