[Python-modules-commits] r17285 - in packages/sphinx/branches/0.6/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 5, 2011 @ 13:29:31
  Author: jwilk
Revision: 17285

Backport upstream patch to fix incompatibility with jQuery >= 1.4
(closes: #628642). Thanks to Yaroslav Halchenko for the bug report.

Added:
  packages/sphinx/branches/0.6/debian/patches/fix_jquery_1.4_incompatibility.patch
Modified:
  packages/sphinx/branches/0.6/debian/changelog
  packages/sphinx/branches/0.6/debian/patches/series

Modified: packages/sphinx/branches/0.6/debian/changelog
===================================================================
--- packages/sphinx/branches/0.6/debian/changelog	2011-06-03 20:53:45 UTC (rev 17284)
+++ packages/sphinx/branches/0.6/debian/changelog	2011-06-05 13:29:31 UTC (rev 17285)
@@ -1,9 +1,14 @@
 sphinx (0.6.6-4) UNRELEASED; urgency=low
 
+  [ Stefano Rivera ]
   * Improve language and clarify options in manpages.
 
- -- Stefano Rivera <stefano at rivera.za.net>  Mon, 30 Aug 2010 21:48:10 +0200
+  [ Jakub Wilk ]
+  * Backport upstream patch to fix incompatibility with jQuery >= 1.4
+    (closes: #628642). Thanks to Yaroslav Halchenko for the bug report.
 
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 05 Jun 2011 15:27:37 +0200
+
 sphinx (0.6.6-3) unstable; urgency=low
 
   * Add myself to uploaders.

Added: packages/sphinx/branches/0.6/debian/patches/fix_jquery_1.4_incompatibility.patch
===================================================================
--- packages/sphinx/branches/0.6/debian/patches/fix_jquery_1.4_incompatibility.patch	                        (rev 0)
+++ packages/sphinx/branches/0.6/debian/patches/fix_jquery_1.4_incompatibility.patch	2011-06-05 13:29:31 UTC (rev 17285)
@@ -0,0 +1,65 @@
+Description: Fix compatibility with jQuery 1.4.
+Bug-Debian: http://bugs.debian.org/628642
+Origin: backport, https://bitbucket.org/birkenfeld/sphinx/changeset/72375ba800b6
+
+--- a/sphinx/themes/basic/static/doctools.js
++++ b/sphinx/themes/basic/static/doctools.js
+@@ -3,14 +3,14 @@
+ /**
+  * make the code below compatible with browsers without
+  * an installed firebug like debugger
+- */
+ if (!window.console || !console.firebug) {
+   var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
+       "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
+   window.console = {};
+   for (var i = 0; i < names.length; ++i)
+-    window.console[names[i]] = function() {}
++    window.console[names[i]] = function() {};
+ }
++ */
+ 
+ /**
+  * small helper function to urldecode strings
+@@ -67,7 +67,7 @@
+     if (node.nodeType == 3) {
+       var val = node.nodeValue;
+       var pos = val.toLowerCase().indexOf(text);
+-      if (pos >= 0 && !jQuery.className.has(node.parentNode, className)) {
++      if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
+         var span = document.createElement("span");
+         span.className = className;
+         span.appendChild(document.createTextNode(val.substr(pos, text.length)));
+@@ -79,7 +79,7 @@
+     }
+     else if (!jQuery(node).is("button, select, textarea")) {
+       jQuery.each(node.childNodes, function() {
+-        highlight(this)
++        highlight(this);
+       });
+     }
+   }
+@@ -183,7 +183,7 @@
+     var togglers = $('img.toggler').click(function() {
+       var src = $(this).attr('src');
+       var idnum = $(this).attr('id').substr(7);
+-      console.log($('tr.cg-' + idnum).toggle());
++      $('tr.cg-' + idnum).toggle();
+       if (src.substr(-9) == 'minus.png')
+         $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
+       else
+--- a/sphinx/themes/basic/static/searchtools.js
++++ b/sphinx/themes/basic/static/searchtools.js
+@@ -316,9 +316,9 @@
+     };
+     var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
+ 
+-    console.debug('SEARCH: searching for:');
+-    console.info('required: ', searchterms);
+-    console.info('excluded: ', excluded);
++    // console.debug('SEARCH: searching for:');
++    // console.info('required: ', searchterms);
++    // console.info('excluded: ', excluded);
+ 
+     // prepare search
+     var filenames = this._index.filenames;

Modified: packages/sphinx/branches/0.6/debian/patches/series
===================================================================
--- packages/sphinx/branches/0.6/debian/patches/series	2011-06-03 20:53:45 UTC (rev 17284)
+++ packages/sphinx/branches/0.6/debian/patches/series	2011-06-05 13:29:31 UTC (rev 17285)
@@ -1 +1,2 @@
 move_static_files_outside_site-packages.patch
+fix_jquery_1.4_incompatibility.patch