[Python-modules-commits] r18870 - in packages/python-django/trunk/debian (3 files)

[hertzog at users.alioth.debian.org]

    Date: Wednesday, October 12, 2011 @ 06:44:41
  Author: hertzog
Revision: 18870

Add 05_fix_djangodocs_sphinx_ext.diff to support Sphinx 1.0.8.
Closes: #643758

Added:
  packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff
Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2011-10-11 22:44:44 UTC (rev 18869)
+++ packages/python-django/trunk/debian/changelog	2011-10-12 06:44:41 UTC (rev 18870)
@@ -5,6 +5,8 @@
     Thanks to Jakub Wilk for the suggestion.
   * Enable 02_disable-sources-in-sphinxdoc.diff since #641710 has been
     fixed.
+  * Add 05_fix_djangodocs_sphinx_ext.diff to support Sphinx 1.0.8.
+    Closes: #643758
 
  -- Raphaël Hertzog <hertzog at debian.org>  Thu, 15 Sep 2011 14:35:45 +0200
 

Added: packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff
===================================================================
--- packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/05_fix_djangodocs_sphinx_ext.diff	2011-10-12 06:44:41 UTC (rev 18870)
@@ -0,0 +1,13 @@
+Description: Fix djangodocs Sphinx extension to work with latest Sphinx
+Origin: upstream, https://code.djangoproject.com/changeset/16231
+Bug-Debian: http://bugs.debian.org/643758
+Forwarded: not-needed
+
+--- a/docs/_ext/djangodocs.py	(revision 16223)
++++ b/docs/_ext/djangodocs.py	(revision 16231)
+@@ -135,4 +135,5 @@
+         self.body.append('(')
+         self.first_param = 1
++        self.param_separator = node.child_text_separator
+ 
+     def depart_desc_parameterlist(self, node):

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2011-10-11 22:44:44 UTC (rev 18869)
+++ packages/python-django/trunk/debian/patches/series	2011-10-12 06:44:41 UTC (rev 18870)
@@ -2,3 +2,4 @@
 02_disable-sources-in-sphinxdoc.diff
 03_manpage.diff
 04_hyphen-manpage.diff
+05_fix_djangodocs_sphinx_ext.diff