[Python-modules-commits] r20231 - in packages/numpy/branches/sid/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Tuesday, January 31, 2012 @ 23:06:35
  Author: morph
Revision: 20231

* debian/patches/20_sphinx_1.1.2.diff
  - fix a FTBFS with Sphinx 1.1.2 due to autoindex not being allowed in a
    glossary section; thanks to Jakub Wilk for the report; Closes: #655635

Added:
  packages/numpy/branches/sid/debian/patches/20_sphinx_1.1.2.diff
Modified:
  packages/numpy/branches/sid/debian/changelog
  packages/numpy/branches/sid/debian/patches/series

Modified: packages/numpy/branches/sid/debian/changelog
===================================================================
--- packages/numpy/branches/sid/debian/changelog	2012-01-31 22:47:06 UTC (rev 20230)
+++ packages/numpy/branches/sid/debian/changelog	2012-01-31 23:06:35 UTC (rev 20231)
@@ -8,8 +8,13 @@
     description of the dependencies generation is available in
     README.DebianMaints file. Closes: #643873
 
- -- Sandro Tosi <morph at debian.org>  Sun, 29 Jan 2012 11:32:09 +0100
+  [ Sandro Tosi ]
+  * debian/patches/20_sphinx_1.1.2.diff
+    - fix a FTBFS with Sphinx 1.1.2 due to autoindex not being allowed in a
+      glossary section; thanks to Jakub Wilk for the report; Closes: #655635
 
+ -- Sandro Tosi <morph at debian.org>  Wed, 01 Feb 2012 00:01:24 +0100
+
 python-numpy (1:1.5.1-3) unstable; urgency=low
 
   * debian/rules

Added: packages/numpy/branches/sid/debian/patches/20_sphinx_1.1.2.diff
===================================================================
--- packages/numpy/branches/sid/debian/patches/20_sphinx_1.1.2.diff	                        (rev 0)
+++ packages/numpy/branches/sid/debian/patches/20_sphinx_1.1.2.diff	2012-01-31 23:06:35 UTC (rev 20231)
@@ -0,0 +1,19 @@
+Description: fix FTBFS with sphinx 1.1.2 because automodule is not allowed in glossary
+Author: Pauli Virtanen
+Origin: https://github.com/numpy/numpy/commit/1451b414693d63d8224857b1c67726eb8d5f97af
+Forwarded: not-needed
+Index: python-numpy-1.5.1/doc/source/glossary.rst
+===================================================================
+--- python-numpy-1.5.1.orig/doc/source/glossary.rst	2010-11-09 00:58:22.000000000 +0100
++++ python-numpy-1.5.1/doc/source/glossary.rst	2012-01-31 23:31:29.323501993 +0100
+@@ -4,9 +4,7 @@
+ 
+ .. toctree::
+ 
+-.. glossary::
+-
+-   .. automodule:: numpy.doc.glossary
++.. automodule:: numpy.doc.glossary
+ 
+ Jargon
+ ------

Modified: packages/numpy/branches/sid/debian/patches/series
===================================================================
--- packages/numpy/branches/sid/debian/patches/series	2012-01-31 22:47:06 UTC (rev 20230)
+++ packages/numpy/branches/sid/debian/patches/series	2012-01-31 23:06:35 UTC (rev 20231)
@@ -3,3 +3,4 @@
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
 10_use_local_python.org_object.inv_sphinx.diff
+20_sphinx_1.1.2.diff