[Python-modules-commits] r15967 - in packages/sphinx-issuetracker/trunk/debian/patches (3 files)

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

    Date: Thursday, March 3, 2011 @ 14:54:20
  Author: fladi-guest
Revision: 15967

Simplify intersphinx_mapping.patch.

Modified:
  packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch
  packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch
  packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch

Modified: packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch	2011-03-03 13:39:21 UTC (rev 15966)
+++ packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch	2011-03-03 14:54:20 UTC (rev 15967)
@@ -4,12 +4,12 @@
 Last-Update: 2011-03-03
 Forwarded: not-needed
 
-Index: sphinx-issuetracker/doc/conf.py
+Index: sphinxcontrib-issuetracker-0.7.1/doc/conf.py
 ===================================================================
---- sphinx-issuetracker.orig/doc/conf.py	2011-03-03 13:15:02.850505404 +0100
-+++ sphinx-issuetracker/doc/conf.py	2011-03-03 13:15:28.710165273 +0100
-@@ -62,9 +62,7 @@
-     intersphinx_mapping['sphinx'] = ('http://sphinx.pocoo.org/', '/usr/share/doc/python-sphinx/html/objects.inv')
+--- sphinxcontrib-issuetracker-0.7.1.orig/doc/conf.py	2011-03-03 15:44:22.481617721 +0100
++++ sphinxcontrib-issuetracker-0.7.1/doc/conf.py	2011-03-03 15:44:48.309278045 +0100
+@@ -70,9 +70,7 @@
+                                              '/usr/share/doc/python-sphinx/html/objects.inv'))
  
  
 -issuetracker = 'bitbucket'

Modified: packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch	2011-03-03 13:39:21 UTC (rev 15966)
+++ packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch	2011-03-03 14:54:20 UTC (rev 15967)
@@ -5,10 +5,10 @@
 Last-Update: 2011-03-03
 Forwarded: not-needed
 
-Index: sphinx-issuetracker/sphinxcontrib/issuetracker.py
+Index: sphinxcontrib-issuetracker-0.7.1/sphinxcontrib/issuetracker.py
 ===================================================================
---- sphinx-issuetracker.orig/sphinxcontrib/issuetracker.py	2011-03-03 13:46:49.021538024 +0100
-+++ sphinx-issuetracker/sphinxcontrib/issuetracker.py	2011-03-03 14:15:20.419236885 +0100
+--- sphinxcontrib-issuetracker-0.7.1.orig/sphinxcontrib/issuetracker.py	2011-03-03 15:28:58.017782406 +0100
++++ sphinxcontrib-issuetracker-0.7.1/sphinxcontrib/issuetracker.py	2011-03-03 15:44:53.357211648 +0100
 @@ -75,7 +75,10 @@
  
  

Modified: packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch	2011-03-03 13:39:21 UTC (rev 15966)
+++ packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch	2011-03-03 14:54:20 UTC (rev 15967)
@@ -7,23 +7,31 @@
 Forwarded: not-needed
 Last-Update: 2011-03-03
 
-Index: sphinx-issuetracker/doc/conf.py
+Index: sphinxcontrib-issuetracker-0.7.1/doc/conf.py
 ===================================================================
---- sphinx-issuetracker.orig/doc/conf.py	2011-01-07 15:01:30.000000000 +0100
-+++ sphinx-issuetracker/doc/conf.py	2011-03-03 13:15:02.850505404 +0100
-@@ -54,8 +54,13 @@
+--- sphinxcontrib-issuetracker-0.7.1.orig/doc/conf.py	2011-03-03 15:28:58.169780404 +0100
++++ sphinxcontrib-issuetracker-0.7.1/doc/conf.py	2011-03-03 15:44:22.481617721 +0100
+@@ -54,8 +54,21 @@
  html_theme = 'default'
  html_static_path = []
  
 -intersphinx_mapping = {'python': ('http://docs.python.org/', None),
 -                       'sphinx': ('http://sphinx.pocoo.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'))
 +
-+if os.path.isfile('/usr/share/doc/python' + '.'.join([str(x) for x in sys.version_info[0:2]]) + '/html/objects.inv'):
-+    intersphinx_mapping['python'] = ('http://docs.python.org/', '/usr/share/doc/python' + '.'.join([str(x) for x in sys.version_info[0:2]]) + '/html/objects.inv')
-+if os.path.isfile('/usr/share/doc/python-sphinx/html/objects.inv'):
-+    intersphinx_mapping['sphinx'] = ('http://sphinx.pocoo.org/', '/usr/share/doc/python-sphinx/html/objects.inv')
-+
  
  issuetracker = 'bitbucket'
  issuetracker_project = 'sphinx-contrib'