← Back to branch summary

~ubuntu-branches/debian/sid/python-django/sid

« back to all changes in this revision

Viewing changes to debian/patches/07_fix_for_sphinx1.1.2.diff

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2011-11-28 09:03:13 UTC
  • Revision ID: package-import@ubuntu.com-20111128090313-peri6zav82d0buei
Tags: 1.3.1-3
http://bugs.debian.org/645094
http://bugs.debian.org/647134
http://bugs.debian.org/649624
* Add 06_use_debian_geoip_database_as_default.diff to use the default
  location of the GeoIP database used by the Debian package
  geoip-database-contrib. Closes: #645094
  Add this package to suggests. Thanks to Tapio Rantala
  <tapio.rantala@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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_fix_for_sphinx1.1.2.diff
 
1
Description: Fix Django to build with Sphinx 1.1.2
 
2
Origin: upstream, https://code.djangoproject.com/changeset/16223
 
3
 
 
4
--- a/docs/_ext/djangodocs.py   (revision 14652)
 
5
+++ b/docs/_ext/djangodocs.py   (revision 16223)
 
6
@@ -128,4 +128,5 @@
 
7
     # Don't use border=1, which docutils does by default.
 
8
     def visit_table(self, node):
 
9
+        self._table_row_index = 0 # Needed by Sphinx
 
10
         self.body.append(self.starttag(node, 'table', CLASS='docutils'))
 
11