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

[morph at users.alioth.debian.org]

    Date: Sunday, September 16, 2012 @ 21:35:53
  Author: morph
Revision: 22687

* debian/patches/60_new_syntax_to_load_searchindex.patch
  - removed, merged upstream

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2012-09-16 18:46:10 UTC (rev 22686)
+++ packages/matplotlib/trunk/debian/changelog	2012-09-16 21:35:53 UTC (rev 22687)
@@ -7,8 +7,10 @@
     - converted to DEP-5 format
     - updated to new upstream code
     - extended packaging copyright years
+  * debian/patches/60_new_syntax_to_load_searchindex.patch
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sun, 16 Sep 2012 20:45:50 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 16 Sep 2012 23:35:28 +0200
 
 matplotlib (1.1.1-1) experimental; urgency=low
 

Deleted: packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch	2012-09-16 18:46:10 UTC (rev 22686)
+++ packages/matplotlib/trunk/debian/patches/60_new_syntax_to_load_searchindex.patch	2012-09-16 21:35:53 UTC (rev 22687)
@@ -1,17 +0,0 @@
-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-09-16 18:46:10 UTC (rev 22686)
+++ packages/matplotlib/trunk/debian/patches/series	2012-09-16 21:35:53 UTC (rev 22687)
@@ -3,4 +3,3 @@
 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