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

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

    Date: Thursday, March 3, 2011 @ 12:45:20
  Author: fladi-guest
Revision: 15965

Conditionally pull in intersphinx mappings.
Update changelog.

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

Modified: packages/sphinx-issuetracker/trunk/debian/changelog
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/changelog	2011-03-03 00:06:20 UTC (rev 15964)
+++ packages/sphinx-issuetracker/trunk/debian/changelog	2011-03-03 12:45:20 UTC (rev 15965)
@@ -1,11 +1,17 @@
 sphinx-issuetracker (0.7.1-1) unstable; urgency=low
 
   * New upstream version.
+  * Upload to unstable.
   * Fix object.inv location for python-sphinx.
-  * Suggest python-debianbts as my patch has been included upstream.
-  * Upload to unstable.
+  * Recommend python-debianbts as my patch has been included upstream.
+  * Move python-launchpadlib and python-lxml to Recommends as they are
+    optional.
+  * Add patch to conditionaly add intersphinx mappings, depending on the
+    presence of files.
+  * Add patch to disable issuetracker integration during build to prevent
+    network access.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 21 Jan 2011 12:06:53 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 03 Mar 2011 13:43:52 +0100
 
 sphinx-issuetracker (0.5.4-1) experimental; urgency=low
 

Modified: packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch	2011-03-03 00:06:20 UTC (rev 15964)
+++ packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch	2011-03-03 12:45:20 UTC (rev 15965)
@@ -1,17 +1,17 @@
 Description: Disable issuetracker integration during build.
  This allows the package to be built without network access.
 Author: Fladischer Michael <FladischerMichael at fladi.at>
-Last-Update: 2011-03-01
+Last-Update: 2011-03-03
 Forwarded: not-needed
 
-Index: sphinxcontrib-issuetracker-0.7.1/doc/conf.py
+Index: sphinx-issuetracker/doc/conf.py
 ===================================================================
---- sphinxcontrib-issuetracker-0.7.1.orig/doc/conf.py	2011-03-01 15:20:09.195726194 +0100
-+++ sphinxcontrib-issuetracker-0.7.1/doc/conf.py	2011-03-01 15:20:16.435632053 +0100
-@@ -57,9 +57,7 @@
- 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'),
-                        'sphinx': ('http://sphinx.pocoo.org/', '/usr/share/doc/python-sphinx/html/objects.inv')}
+--- 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')
  
+ 
 -issuetracker = 'bitbucket'
 -issuetracker_project = 'sphinx-contrib'
 -issuetracker_user = 'birkenfeld'

Modified: packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch	2011-03-03 00:06:20 UTC (rev 15964)
+++ packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch	2011-03-03 12:45:20 UTC (rev 15965)
@@ -1,21 +1,29 @@
-Description: Use local object inventory files instead of 
- downloading them.
+Description: Use local object inventory files for sphinx
+ To prevent sphinx-build from downlaoding thoese files 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-01-19
+Last-Update: 2011-03-03
 
 Index: sphinx-issuetracker/doc/conf.py
 ===================================================================
---- sphinx-issuetracker.orig/doc/conf.py	2011-03-01 15:18:52.288726581 +0100
-+++ sphinx-issuetracker/doc/conf.py     	2011-03-01 15:19:25.884289749 +0100
-@@ -54,8 +54,8 @@
+--- 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 @@
  html_theme = 'default'
  html_static_path = []
  
 -intersphinx_mapping = {'python': ('http://docs.python.org/', None),
 -                       'sphinx': ('http://sphinx.pocoo.org/', None)}
-+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'),
-+                       'sphinx': ('http://sphinx.pocoo.org/', '/usr/share/doc/python-sphinx/html/objects.inv')}
++intersphinx_mapping = {}
++
++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'