[Python-modules-commits] [twisted] 07/10: Use local copies of object.inv for building sphinx docs. Closes #836169.

Free Ekanayaka freee at moszumanska.debian.org
Fri Oct 21 10:09:06 UTC 2016


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

freee pushed a commit to branch master
in repository twisted.

commit a007a4abd956d6ca2817401b3e3fffe90463ab9b
Author: Free Ekanayaka <freee at debian.org>
Date:   Fri Oct 21 07:47:20 2016 +0000

    Use local copies of object.inv for building sphinx docs. Closes #836169.
---
 debian/control                             | 19 +++++++++++++------
 debian/patches/0004-localIntersphinx.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 62260a3..82419d1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,19 @@ Section: python
 Priority: optional
 Maintainer: Matthias Klose <doko at debian.org>
 Uploaders: Free Ekanayaka <freee at debian.org>
-Build-Depends: debhelper (>=7.0.50~), patch,
-  python-all-dev, python-all-dbg,
-  python-zope.interface-dbg (>= 4.0.2), python-setuptools,
-  dh-python,
-  python3-all-dev, python3-all-dbg,
-  python3-zope.interface (>= 4.0.2), python3-setuptools
+Build-Depends: debhelper (>=7.0.50~),
+               dh-python,
+               patch,
+               python-all-dev,
+               python-all-dbg,
+               python-zope.interface-dbg (>= 4.0.2),
+               python-setuptools,
+               python-doc,
+               python3-all-dev,
+               python3-all-dbg,
+               python3-zope.interface (>= 4.0.2),
+               python3-setuptools,
+               python3-doc
 Build-Depends-Indep: python3-sphinx
 Standards-Version: 3.9.8
 Homepage: https://github.com/waylan/Python-Markdown
diff --git a/debian/patches/0004-localIntersphinx.patch b/debian/patches/0004-localIntersphinx.patch
new file mode 100644
index 0000000..bdbd7d4
--- /dev/null
+++ b/debian/patches/0004-localIntersphinx.patch
@@ -0,0 +1,25 @@
+From: Free Ekanayaka <free.ekanayaka at gmail.com>
+Date: Fri, 21 Oct 2016 07:37:26 +0000
+Subject: localIntersphinx
+
+Use local copies of object.inv for building documentation.
+Doesn't need forwarding.
+---
+ docs/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 5f498b2..ab033a0 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -359,8 +359,8 @@ traclinks_base_url = 'https://twistedmatrix.com/trac'
+ # tuple of (<external sphinx documentation URI>, <inventory file location>).
+ # The inventory file may be None to use the default location at the given URI.
+ intersphinx_mapping = {
+-    'py2': ('http://docs.python.org/2.7', None),
+-    'py3': ('http://docs.python.org/3.3', None),
++    'py2': ('/usr/share/doc/python-doc/html', None),
++    'py3': ('/usr/share/doc/python3-doc/html', None),
+ }
+ # How long to cache remote inventories. Positive is a number of days,
+ # negative means infinite. The default is 5 days, which should be fine
diff --git a/debian/patches/series b/debian/patches/series
index cc55506..e25a771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 wxpython3.0.patch
 combinedlog.patch
 sphinx-theme.diff
+0004-localIntersphinx.patch

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



More information about the Python-modules-commits mailing list