[Python-modules-commits] r21105 - in packages/matplotlib/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Sunday, April 8, 2012 @ 14:47:55
  Author: morph
Revision: 21105

use new Sphinx syntax to load searchindex.js so dh_sphinxdoc is able to recognize search.html as a valid Sphinx search page

Added:
  packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2012-04-08 12:16:53 UTC (rev 21104)
+++ packages/matplotlib/trunk/debian/changelog	2012-04-08 14:47:55 UTC (rev 21105)
@@ -1,3 +1,11 @@
+matplotlib (1.1.1~rc1-2) UNRELEASED; urgency=low
+
+  * debian/patches/60_new_syntax_to_load_searchindex.patch
+    - use new Sphinx syntax to load searchindex.js so dh_sphinxdoc is able to
+      recognize search.html as a valid Sphinx search page
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 08 Apr 2012 16:46:05 +0200
+
 matplotlib (1.1.1~rc1-1) unstable; urgency=low
 
   * New upstream (release candidate) release

Added: packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch	2012-04-08 14:47:55 UTC (rev 21105)
@@ -0,0 +1,17 @@
+Description: use recent sphinx syntax to load searchindex.js, so dh_sphinxdoc can recognize it
+Author: Sandro Tosi <morph at debian.org>
+Forwarded: yes
+Bug: https://github.com/matplotlib/matplotlib/issues/820
+Index: matplotlib-1.1.1~rc1/doc/_templates/search.html
+===================================================================
+--- matplotlib-1.1.1~rc1.orig/doc/_templates/search.html	2012-03-23 02:58:28.000000000 +0100
++++ matplotlib-1.1.1~rc1/doc/_templates/search.html	2012-04-08 16:03:22.404159237 +0200
+@@ -38,5 +38,7 @@
+ {% endblock %}
+ {% block footer %}
+   {{ super() }}
+-  <script type="text/javascript" src="searchindex.js"></script>
++  <script type="text/javascript">
++    jQuery(function() { Search.loadIndex("searchindex.js"); });
++  </script>
+ {% endblock %}

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2012-04-08 12:16:53 UTC (rev 21104)
+++ packages/matplotlib/trunk/debian/patches/series	2012-04-08 14:47:55 UTC (rev 21105)
@@ -3,3 +3,4 @@
 30_disable_sample_downloads.patch
 40_bts608939_draw_markers_description.patch
 50_bts608942_spaces_in_param_args.patch
+60_new_syntax_to_load_searchindex.patch