[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.12-1-25-g840fa2b

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

The following commit has been merged in the master branch:
commit 0abef42fcf866e7a0f9e9dac3f948ab4f6aa3150
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Thu Nov 3 15:33:39 2011 +0100

    update the patch

diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index d6faf21..21d124d 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -1,5 +1,6 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Mon, 31 Oct 2011 17:10:37 +0100
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?=
+ <picca at synchrotron-soleil.fr>
+Date: Thu, 3 Nov 2011 15:31:46 +0100
 Subject: fix-documentation-installation
 
 ---
@@ -8,22 +9,22 @@ Subject: fix-documentation-installation
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 6f80210..ec81533 100644
+index a74961f..b9892f6 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -47,8 +47,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:
+@@ -52,8 +52,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:
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index a2308a9..93332bd 100644
+index 3e72303..717bf75 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
 @@ -35,6 +35,7 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'

-- 
A Python IDE for scientists