[SCM] A Python IDE for scientists branch, master, updated. debian/2.2.0_beta3+dfsg-1-4-g34158f1

[Frédéric-Emmanuel P?==?UTF-8?Q?ICCA]

The following commit has been merged in the master branch:
commit 34158f10faa3d9fef907fc097c2562461b520007
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Wed Mar 13 17:17:01 2013 +0100

    refresh the patch series to deal with the jquery path

diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 977092f..9797783 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 |    2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ spyderlib/__init__.py |    3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index e823e5e..4d6022d 100644
+index 92e1018..b8f1fcf 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -54,8 +54,8 @@ class MyBuildDoc(setup_command.BuildDoc):
@@ -23,15 +23,16 @@ index e823e5e..4d6022d 100644
              setup_command.BuildDoc.run(self)
          except UnicodeDecodeError:
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index 2d342c2..814af8d 100644
+index 1d899d0..50d2414 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
-@@ -35,6 +35,8 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
+@@ -35,6 +35,9 @@ __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 = MATHJAXPATH = ''
+ DATAPATH = LOCALEPATH = DOCPATH = MATHJAXPATH = JQUERYPATH = ''
 +DOCPATH = '/usr/share/doc/python-spyderlib/html'
 +MATHJAXPATH = '/usr/share/javascript/mathjax'
++JQUERYPATH = '/usr/share/javascript/jquery'
  
  def add_to_distribution(dist):
      """Add package to py2exe/cx_Freeze distribution object

-- 
A Python IDE for scientists