[SCM] A Python IDE for scientists branch, master, updated. debian/2.2.0_rc+dfsg-1-6-g78fc2d2

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

The following commit has been merged in the master branch:
commit d29c67dca46e4852a226967475f6518c221d8475
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed May 8 21:30:38 2013 +0200

    refresh the patch series

diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 9797783..0aeb0b9 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -8,22 +8,22 @@ Subject: fix-documentation-installation
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 92e1018..b8f1fcf 100644
+index c43d627..d96bc12 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -54,8 +54,8 @@ class MyBuildDoc(setup_command.BuildDoc):
-     def run(self):
-         build = self.get_finalized_command('build')
-         sys.path.insert(0, os.path.abspath(build.build_lib))
--        dirname = self.distribution.get_command_obj('build').build_purelib
--        self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
-+        #dirname = self.distribution.get_command_obj('build').build_purelib
-+        #self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
-         try:
-             setup_command.BuildDoc.run(self)
-         except UnicodeDecodeError:
+@@ -83,8 +83,8 @@ try:
+         def run(self):
+             build = self.get_finalized_command('build')
+             sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
++            #dirname = self.distribution.get_command_obj('build').build_purelib
++            #self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+             try:
+                 setup_command.BuildDoc.run(self)
+             except UnicodeDecodeError:
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index 1d899d0..50d2414 100644
+index cf0729b..ffe69fe 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
 @@ -35,6 +35,9 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'

-- 
A Python IDE for scientists