[Python-apps-commits] r9231 - in packages/tox/trunk/debian (5 files)

[warsaw-guest at users.alioth.debian.org]

    Date: Monday, November 12, 2012 @ 15:42:01
  Author: warsaw-guest
Revision: 9231

* debian/control:
  + wrap-and-sort
  + Add to B-D: python-py and python-pkg-resources to silence lintian.
  + Add to B-D: python-doc for quilt patch to avoid trying to download
    the intersphinx object inventory.  For more details, see:
    http://lists.debian.org/debian-python/2011/07/msg00016.html
* debian/patches/intersphinx_mapping.patch: Patch to use python-doc's
  objects.inv file; see above link for details.

Added:
  packages/tox/trunk/debian/patches/
  packages/tox/trunk/debian/patches/intersphinx_mapping.patch
  packages/tox/trunk/debian/patches/series
Modified:
  packages/tox/trunk/debian/changelog
  packages/tox/trunk/debian/control

Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog	2012-11-11 20:29:33 UTC (rev 9230)
+++ packages/tox/trunk/debian/changelog	2012-11-12 15:42:01 UTC (rev 9231)
@@ -5,7 +5,14 @@
 
   [ Barry Warsaw ]
   * debian/watch: Added
-  * debian/control: wrap-and-sort
+  * debian/control:
+    + wrap-and-sort
+    + Add to B-D: python-py and python-pkg-resources to silence lintian.
+    + Add to B-D: python-doc for quilt patch to avoid trying to download
+      the intersphinx object inventory.  For more details, see:
+      http://lists.debian.org/debian-python/2011/07/msg00016.html
+  * debian/patches/intersphinx_mapping.patch: Patch to use python-doc's
+    objects.inv file; see above link for details.
   * debian/manpage/*, debian/rules: Install tox.1 manpage.
 
  -- Barry Warsaw <barry at python.org>  Fri, 09 Nov 2012 18:07:19 -0500

Modified: packages/tox/trunk/debian/control
===================================================================
--- packages/tox/trunk/debian/control	2012-11-11 20:29:33 UTC (rev 9230)
+++ packages/tox/trunk/debian/control	2012-11-12 15:42:01 UTC (rev 9231)
@@ -11,7 +11,8 @@
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg),
                python-virtualenv,
-               python-pkg-resources
+               python-pkg-resources,
+               python-doc
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/tox/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/tox/trunk/

Added: packages/tox/trunk/debian/patches/intersphinx_mapping.patch
===================================================================
--- packages/tox/trunk/debian/patches/intersphinx_mapping.patch	                        (rev 0)
+++ packages/tox/trunk/debian/patches/intersphinx_mapping.patch	2012-11-12 15:42:01 UTC (rev 9231)
@@ -0,0 +1,37 @@
+Description: Use local object inventory files for sphinx
+ Use the local object inventory files to prevent sphinx-build from 
+ downloading them during build.
+ This patch makes the intersphinx mappings depend on the existence of 
+ these files, thus passing Debian Policy 12.3 while still maintaining 
+ a level of comfort for the reader of the documentation.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Forwarded: not-needed
+Last-Update: 2011-03-03
+
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -253,7 +253,23 @@
+ 
+ 
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}
++def check_object_path(key, url, path):
++    if os.path.isfile(path):
++        return {key: (url, path)}
++    return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(
++    check_object_path('python',
++                      'http://docs.python.org/',
++                      '/usr/share/doc/python'
++                      + '.'.join([str(x) for x in sys.version_info[0:2]])
++                      + '/html/objects.inv'))
++intersphinx_mapping.update(
++    check_object_path('sphinx',
++                      'http://sphinx.pocoo.org/',
++                      '/usr/share/doc/python-sphinx/html/objects.inv'))
++
+ 
+ def setup(app):
+     #from sphinx.ext.autodoc import cut_lines

Added: packages/tox/trunk/debian/patches/series
===================================================================
--- packages/tox/trunk/debian/patches/series	                        (rev 0)
+++ packages/tox/trunk/debian/patches/series	2012-11-12 15:42:01 UTC (rev 9231)
@@ -0,0 +1 @@
+intersphinx_mapping.patch