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

[hertzog at users.alioth.debian.org]

    Date: Monday, November 28, 2011 @ 08:03:00
  Author: hertzog
Revision: 19454

Add 07_fix_for_sphinx1.1.2.diff to fix build with Sphinx 1.1.2. Thanks to
Jakub Wilk for the advance warning. Closes: #649624

Added:
  packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.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-11-27 15:18:19 UTC (rev 19453)
+++ packages/python-django/trunk/debian/changelog	2011-11-28 08:03:00 UTC (rev 19454)
@@ -7,6 +7,8 @@
     <tapio.rantala at iki.fi> for the patch.
   * Bump build-dep on python-sphinx to 1.0.8 to ensure we have a version
     where #641710 is fixed. Closes: #647134
+  * Add 07_fix_for_sphinx1.1.2.diff to fix build with Sphinx 1.1.2. Thanks to
+    Jakub Wilk for the advance warning. Closes: #649624
 
  -- Raphaël Hertzog <hertzog at debian.org>  Sat, 22 Oct 2011 09:39:28 +0200
 

Added: packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff
===================================================================
--- packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/07_fix_for_sphinx1.1.2.diff	2011-11-28 08:03:00 UTC (rev 19454)
@@ -0,0 +1,11 @@
+Description: Fix Django to build with Sphinx 1.1.2
+Origin: upstream, https://code.djangoproject.com/changeset/16223
+
+--- a/docs/_ext/djangodocs.py	(revision 14652)
++++ b/docs/_ext/djangodocs.py	(revision 16223)
+@@ -128,4 +128,5 @@
+     # Don't use border=1, which docutils does by default.
+     def visit_table(self, node):
++        self._table_row_index = 0 # Needed by Sphinx
+         self.body.append(self.starttag(node, 'table', CLASS='docutils'))
+ 

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2011-11-27 15:18:19 UTC (rev 19453)
+++ packages/python-django/trunk/debian/patches/series	2011-11-28 08:03:00 UTC (rev 19454)
@@ -4,3 +4,4 @@
 04_hyphen-manpage.diff
 05_fix_djangodocs_sphinx_ext.diff
 06_use_debian_geoip_database_as_default.diff
+07_fix_for_sphinx1.1.2.diff