[spyder] 01/01: release

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository spyder.

commit 928ad163d2582a9baf26b1d517669d3ad61b9a1f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Aug 21 21:54:08 2013 +0200

    release
---
 debian/changelog                                       |    3 ++-
 .../patches/0001-fix-documentation-installation.patch  |   16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c4a90d..6c01e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-spyder (2.2.3+dfsg-1) UNRELEASED; urgency=low
+spyder (2.2.3+dfsg-1) unstable; urgency=low
 
   * Imported Upstream version 2.2.3+dfsg
+  * debian/copyright updated
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 21 Aug 2013 15:17:46 +0200
 
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 0aeb0b9..a534149 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -3,15 +3,15 @@ Date: Sun, 1 Apr 2012 10:08:11 +0200
 Subject: fix-documentation-installation
 
 ---
- setup.py              |    4 ++--
- spyderlib/__init__.py |    3 +++
+ setup.py              | 4 ++--
+ spyderlib/__init__.py | 3 +++
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index c43d627..d96bc12 100644
+index bc81377..7193774 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -83,8 +83,8 @@ try:
+@@ -94,8 +94,8 @@ try:
          def run(self):
              build = self.get_finalized_command('build')
              sys.path.insert(0, os.path.abspath(build.build_lib))
@@ -19,11 +19,11 @@ index c43d627..d96bc12 100644
 -            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:
+ 
+             hhc_exe = get_html_help_exe()
+             self.builder = "html" if hhc_exe is None else "htmlhelp"
 diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index cf0729b..ffe69fe 100644
+index ffa8d53..2018c42 100644
 --- a/spyderlib/__init__.py
 +++ b/spyderlib/__init__.py
 @@ -35,6 +35,9 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git