[SCM] The Molecular Modelling Toolkit packaging branch, master, updated. 41cb1cae0ed0645885e97e86ae5399725d014bd6

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

The following commit has been merged in the master branch:
commit 614ab2bfede2f184e266ac7a0d5fa03aa2b3a4d6
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Sep 18 16:09:49 2011 +0200

    now the doc build properly

diff --git a/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch b/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
index 1fdd852..f4d8758 100644
--- a/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
+++ b/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
@@ -1,36 +1,77 @@
 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 18 Sep 2011 14:52:21 +0200
+Date: Sun, 18 Sep 2011 16:08:59 +0200
 Subject: feature-forwarded-build-sphinx-documentation
 
 ---
- setup.py |   22 +++++++++++++++++++---
- 1 files changed, 19 insertions(+), 3 deletions(-)
+ setup.py |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 46 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 657038d..0204d42 100644
+index 657038d..ebb6f90 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -159,6 +159,19 @@ class modified_install_data(install_data):
+@@ -3,6 +3,7 @@
+ package_name = "MMTK"
+ 
+ from distutils.core import setup, Extension
++from distutils.command.build import build
+ from distutils.command.sdist import sdist
+ from distutils.command.install_data import install_data
+ from distutils import dir_util
+@@ -116,6 +117,14 @@ class ModifiedFileList(FileList):
+                     push(fullname)
+         self.allfiles = list
+ 
++class modified_build(build):
++
++    def has_sphinx(self):
++        if sphinx is None:
++            return False
++        setup_dir = os.path.dirname(os.path.abspath(__file__))
++        return os.path.isdir(os.path.join(setup_dir, 'Doc'))
++    sub_commands = build.sub_commands + [('build_sphinx', has_sphinx)]
+ 
+ class modified_sdist(sdist):
+ 
+@@ -159,6 +168,37 @@ class modified_install_data(install_data):
          self.install_dir = getattr(install_cmd, 'install_lib')
          return install_data.run(self)
  
-+cmdclass = {'sdist': modified_sdist,
-+            'install_data': modified_install_data,
-+            'build_ext': build_ext}
++cmdclass = {
++    'build' : modified_build,
++    'sdist': modified_sdist,
++    'install_data': modified_install_data,
++    'build_ext': build_ext
++}
 +
 +# build the sphinx documentation if available
 +try:
 +    import sphinx
 +except ImportError:
 +    sphinx = None
++
 +if sphinx:
-+    from sphinx.setup_command import BuildDoc
++    from sphinx.setup_command import BuildDoc as _BuildDoc
++
++    class BuildDoc(_BuildDoc):
++        def run(self):
++            # make sure the python path is pointing to the newly built
++            # code so that the documentation is built on this and not a
++            # previously installed version
++            build = self.get_finalized_command('build')
++            sys.path.insert(0, os.path.abspath(build.build_lib))
++            try:
++                sphinx.setup_command.BuildDoc.run(self)
++            except UnicodeDecodeError:
++                print >>sys.stderr, "ERROR: unable to build documentation because Sphinx do not handle source path with non-ASCII characters. Please try to move the source package to another location (path with *only* ASCII characters)."            
++            sys.path.pop(0)
++
 +    cmdclass['build_sphinx'] = BuildDoc
 +
  #################################################################
  # Check various compiler/library properties
  
-@@ -346,7 +359,10 @@ standard and non-standard problems in molecular simulations.
+@@ -346,7 +386,10 @@ standard and non-standard problems in molecular simulations.
         data_files = data_files,
         scripts = ['tviewer'],
  
@@ -40,8 +81,8 @@ index 657038d..0204d42 100644
 +       cmdclass = cmdclass,
 +
 +       command_options={
-+        'build_sphinx': {'config-dir': 'Doc',
-+                         'source-dir' : 'Doc'}
++        'build_sphinx': {
++            'source_dir' : ('setup.py', 'Doc')}
 +        },
         )
 -- 

-- 
The Molecular Modelling Toolkit packaging