[SCM] A Python IDE for scientists branch, master, updated. debian/2.2.0_beta1+dfsg-2-5-ge2f139d

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

The following commit has been merged in the master branch:
commit fc24888707c392d7e7dbff607d023c4177294164
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Feb 4 22:05:38 2013 +0100

    refresh the patch series to cutomize the Matjax path

diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index ed9c0db..262210b 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -4,11 +4,11 @@ Subject: fix-documentation-installation
 
 ---
  setup.py              |    4 ++--
- spyderlib/__init__.py |    1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ spyderlib/__init__.py |    2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index e642337..e6fed69 100644
+index 6d71506..e5fd17e 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -52,8 +52,8 @@ class MyBuildDoc(setup_command.BuildDoc):
@@ -23,14 +23,15 @@ index e642337..e6fed69 100644
              setup_command.BuildDoc.run(self)
          except UnicodeDecodeError:
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index ded5a4e..0ad2c61 100644
+index 9d7fb89..0e66377 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
-@@ -35,6 +35,7 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
+@@ -35,6 +35,8 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
  # Dear (Debian, RPM, ...) package makers, please feel free to customize the
  # following path to module's data (images) and translations:
- DATAPATH = LOCALEPATH = DOCPATH = ''
+ DATAPATH = LOCALEPATH = DOCPATH = MATHJAXPATH = ''
 +DOCPATH = '/usr/share/doc/python-spyderlib/html'
++MATHJAXPATH = '/usr/share/javascript/mathjax'
  
  def add_to_distribution(dist):
      """Add package to py2exe/cx_Freeze distribution object
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
deleted file mode 100644
index a8558c3..0000000
--- a/debian/patches/0003-allow-to-configure-jquery-and-mathjax-location.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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 b757551..7818dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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