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

[barry at users.alioth.debian.org]

    Date: Wednesday, January 29, 2014 @ 18:39:43
  Author: barry
Revision: 27483

* Team upload.
* d/patches/ticket21869.diff: Cherry pick upstream fix for building 
  documentation against Sphinx 1.2.1.

Added:
  packages/python-django/trunk/debian/patches/ticket21869.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	2014-01-29 18:12:42 UTC (rev 27482)
+++ packages/python-django/trunk/debian/changelog	2014-01-29 18:39:43 UTC (rev 27483)
@@ -1,3 +1,11 @@
+python-django (1.6.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches/ticket21869.diff: Cherry pick upstream fix for building 
+    documentation against Sphinx 1.2.1.
+
+ -- Barry Warsaw <barry at debian.org>  Wed, 29 Jan 2014 18:37:51 +0000
+
 python-django (1.6.1-1) unstable; urgency=medium
 
   * New upstream version.

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2014-01-29 18:12:42 UTC (rev 27482)
+++ packages/python-django/trunk/debian/patches/series	2014-01-29 18:39:43 UTC (rev 27483)
@@ -2,3 +2,4 @@
 03_manpage.diff
 06_use_debian_geoip_database_as_default.diff
 07_translation_encoding_fix.diff
+ticket21869.diff

Added: packages/python-django/trunk/debian/patches/ticket21869.diff
===================================================================
--- packages/python-django/trunk/debian/patches/ticket21869.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/ticket21869.diff	2014-01-29 18:39:43 UTC (rev 27483)
@@ -0,0 +1,23 @@
+Subject: Documentation not building on Sphinx 1.2.1
+Origin: https://github.com/django/django/commit/e1d18b9d2e8ac292940f070b0a8cb9733756acd9#diff-b6a99c1d3137306aa674102ff23eafa4R249
+Bug: https://code.djangoproject.com/ticket/21869
+Forwarded: not-needed
+
+--- a/docs/_ext/djangodocs.py
++++ b/docs/_ext/djangodocs.py
+@@ -101,11 +101,13 @@
+         self.compact_p = self.context.pop()
+         self.body.append('</table>\n')
+ 
+-    # <big>? Really?
+     def visit_desc_parameterlist(self, node):
+-        self.body.append('(')
++        self.body.append('(')  # by default sphinx puts <big> around the "("
+         self.first_param = 1
++        self.optional_param_level = 0
+         self.param_separator = node.child_text_separator
++        self.required_params_left = sum([isinstance(c, addnodes.desc_parameter)
++                                         for c in node.children])
+ 
+     def depart_desc_parameterlist(self, node):
+         self.body.append(')')