[Python-modules-commits] r24082 - in packages/ipython/trunk/debian (5 files)

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

    Date: Wednesday, May 1, 2013 @ 12:46:47
  Author: jtaylor-guest
Revision: 24082

sphinx1.2-compat.patch: fix doc build with sphinx 1.2 (Closes: #706531)

Added:
  packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/parallel-2to3.patch
  packages/ipython/trunk/debian/patches/series
  packages/ipython/trunk/debian/patches/shared-static-path.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2013-05-01 12:46:37 UTC (rev 24081)
+++ packages/ipython/trunk/debian/changelog	2013-05-01 12:46:47 UTC (rev 24082)
@@ -2,8 +2,9 @@
 
   * add missing comma to Depends of incomplete-install test
   * drop unnecessary configobj dependency
+  * sphinx1.2-compat.patch: fix doc build with sphinx 1.2 (Closes: #706531)
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 07 Apr 2013 11:25:56 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 01 May 2013 14:46:03 +0200
 
 ipython (0.13.2-1) experimental; urgency=low
 

Modified: packages/ipython/trunk/debian/patches/parallel-2to3.patch
===================================================================
--- packages/ipython/trunk/debian/patches/parallel-2to3.patch	2013-05-01 12:46:37 UTC (rev 24081)
+++ packages/ipython/trunk/debian/patches/parallel-2to3.patch	2013-05-01 12:46:47 UTC (rev 24082)
@@ -4,7 +4,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -265,6 +265,17 @@ if 'setuptools' in sys.modules:
+@@ -262,6 +262,17 @@ if 'setuptools' in sys.modules:
                                    "ipython_win_post_install.py"}}
      
      if PY3:

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2013-05-01 12:46:37 UTC (rev 24081)
+++ packages/ipython/trunk/debian/patches/series	2013-05-01 12:46:47 UTC (rev 24082)
@@ -5,3 +5,4 @@
 use-system-mathjax-if-available.patch
 parallel-2to3.patch
 shared-static-path.patch
+sphinx1.2-compat.patch

Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch	2013-05-01 12:46:37 UTC (rev 24081)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch	2013-05-01 12:46:47 UTC (rev 24082)
@@ -5,7 +5,7 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -157,7 +159,7 @@ class NotebookWebApplication(web.Applica
+@@ -157,7 +157,7 @@ class NotebookWebApplication(web.Applica
          
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
@@ -14,7 +14,7 @@
              cookie_secret=os.urandom(1024),
              login_url="%s/login"%(base_project_url.rstrip('/')),
          )
-@@ -366,7 +368,7 @@ class NotebookApp(BaseIPythonApplication
+@@ -366,7 +366,7 @@ class NotebookApp(BaseIPythonApplication
      def _mathjax_url_default(self):
          if not self.enable_mathjax:
              return u''

Added: packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch
===================================================================
--- packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch	2013-05-01 12:46:47 UTC (rev 24082)
@@ -0,0 +1,28 @@
+Description: Fix inheritance_diagram Sphinx extension for Sphinx 1.2
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706531
+Origin: f657f2b2a6e723c8633e55155fa54f9c3a3050f5
+Author: Thomas Kluyver <takowl at gmail.com>
+
+--- a/docs/sphinxext/inheritance_diagram.py
++++ b/docs/sphinxext/inheritance_diagram.py
+@@ -40,7 +40,9 @@ except ImportError:
+ 
+ from docutils.nodes import Body, Element
+ from docutils.parsers.rst import directives
+-from sphinx.roles import xfileref_role
++from sphinx.roles import XRefRole
++
++xfileref_role = XRefRole()
+ 
+ def my_import(name):
+     """Module importer - taken from the python documentation.
+--- a/docs/source/development/doc_guide.txt
++++ b/docs/source/development/doc_guide.txt
+@@ -160,6 +160,7 @@ they're automatically exposed as a websi
+ 
+ .. [reStructuredText] reStructuredText.  http://docutils.sourceforge.net/rst.html
+ .. [Sphinx] Sphinx. http://sphinx.pocoo.org/
++.. [Matplotlib] http://matplotlib.org/
+ .. [MatplotlibDocGuide] http://matplotlib.sourceforge.net/devel/documenting_mpl.html
+ .. [PEP257] PEP 257.  http://www.python.org/peps/pep-0257.html
+ .. [NumPyDocGuide] NumPy documentation guide. https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt