[SCM] The Molecular Modelling Toolkit packaging branch, master, updated. 9d95748f3a0f4388cf8500fbae12ed425b4ad459

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

The following commit has been merged in the master branch:
commit bae0f14d7502c92c5fa677bd759bddfdcfe906f0
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Tue Sep 20 16:39:39 2011 +0200

    sphinx patch integrated by the upstream.

diff --git a/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch b/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
deleted file mode 100644
index f4d8758..0000000
--- a/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 18 Sep 2011 16:08:59 +0200
-Subject: feature-forwarded-build-sphinx-documentation
-
----
- setup.py |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 46 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 657038d..ebb6f90 100644
---- a/setup.py
-+++ b/setup.py
-@@ -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 = {
-+    '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 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 +386,10 @@ standard and non-standard problems in molecular simulations.
-        data_files = data_files,
-        scripts = ['tviewer'],
- 
--       cmdclass = {'sdist': modified_sdist,
--                   'install_data': modified_install_data,
--                   'build_ext': build_ext},
-+       cmdclass = cmdclass,
-+
-+       command_options={
-+        'build_sphinx': {
-+            'source_dir' : ('setup.py', 'Doc')}
-+        },
-        )
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 840d0b9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-feature-forwarded-build-sphinx-documentation.patch

-- 
The Molecular Modelling Toolkit packaging