[SCM] A Python IDE for scientists branch, master, updated. debian/2.1.10-2-11-gbee1110

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit e9b19cccfb71e28b999c498db8dccd5fa061abee
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Jan 19 18:18:18 2013 +0100

    use the system jquery and mathjax

diff --git a/debian/patches/0003-allow-to-configure-jquery-and-mathjax-location.patch b/debian/patches/0003-allow-to-configure-jquery-and-mathjax-location.patch
new file mode 100644
index 0000000..a8558c3
--- /dev/null
+++ b/debian/patches/0003-allow-to-configure-jquery-and-mathjax-location.patch
@@ -0,0 +1,53 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 19 Jan 2013 18:17:32 +0100
+Subject: allow to configure jquery and mathjax location
+
+---
+ spyderlib/utils/inspector/sphinxify.py          |    4 ++++
+ spyderlib/utils/inspector/templates/layout.html |    4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/spyderlib/utils/inspector/sphinxify.py b/spyderlib/utils/inspector/sphinxify.py
+index 3f6b632..575d6cc 100644
+--- a/spyderlib/utils/inspector/sphinxify.py
++++ b/spyderlib/utils/inspector/sphinxify.py
+@@ -38,6 +38,8 @@ from spyderlib.utils import encoding
+ # version of Spyder (i.e. the py2exe or cx_Freeze build)
+ CONFDIR_PATH = get_module_source_path('spyderlib.utils.inspector')
+ CSS_PATH = osp.join(CONFDIR_PATH, 'static', 'css')
++JQUERY_PATH = '/usr/share/javascript/jquery/jquery.js'
++MATHJAX_PATH = '/usr/share/javascript/mathjax/MathJax.js'
+ 
+ 
+ def is_sphinx_markup(docstring):
+@@ -91,6 +93,8 @@ def generate_context(title, argspec, note, math):
+       # Static variables
+       'css_path': CSS_PATH,
+       'js_path': osp.join(CONFDIR_PATH, 'js'),
++      'jquery_path': JQUERY_PATH,
++      'mathjax_path': MATHJAX_PATH,
+       'right_sphinx_version': '' if sphinx_version < "1.1" else 'true',
+       'platform': sys.platform
+     }
+diff --git a/spyderlib/utils/inspector/templates/layout.html b/spyderlib/utils/inspector/templates/layout.html
+index bbc5af4..d5166b9 100644
+--- a/spyderlib/utils/inspector/templates/layout.html
++++ b/spyderlib/utils/inspector/templates/layout.html
+@@ -18,7 +18,7 @@
+     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+     <link rel="stylesheet" href="{{css_path}}/default.css" type="text/css" />
+     <link rel="stylesheet" href="{{css_path}}/pygments.css" type="text/css" />
+-    <script type="text/javascript" src="{{js_path}}/jquery-1.7.1.min.js"></script>
++    <script type="text/javascript" src="{{jquery_path}}"></script>
+     
+     {% if right_sphinx_version and math_on %}
+     {# DON'T try to load MathJax from the net. It's slow and sometimes gives
+@@ -26,7 +26,7 @@
+        http://tex.stackexchange.com/questions/2692/comparing-mathjax-and-mathml
+     #}
+     <script type="text/javascript" 
+-    src="{{js_path}}/mathjax/MathJax.js?config=TeX-AMS-MML_SVG-full">
++    src="{{mathjax_path}}?config=TeX-AMS-MML_SVG-full">
+     </script>
+     {% endif %}
+ </head>
diff --git a/debian/patches/series b/debian/patches/series
index 7818dc4..b757551 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-fix-documentation-installation.patch
 0002-feature-forwarded-add-icon-to-desktop-file.patch
+0003-allow-to-configure-jquery-and-mathjax-location.patch

-- 
A Python IDE for scientists