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

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Sun Sep 18 15:06:29 UTC 2011


The following commit has been merged in the master branch:
commit afd4137e9f029fcde0461cea4c3c28937a65c90c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Sep 18 14:52:39 2011 +0200

    build the sphinx documentation from the setup.py

diff --git a/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch b/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
new file mode 100644
index 0000000..1fdd852
--- /dev/null
+++ b/debian/patches/0001-feature-forwarded-build-sphinx-documentation.patch
@@ -0,0 +1,47 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 18 Sep 2011 14:52:21 +0200
+Subject: feature-forwarded-build-sphinx-documentation
+
+---
+ setup.py |   22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 657038d..0204d42 100644
+--- a/setup.py
++++ b/setup.py
+@@ -159,6 +159,19 @@ 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}
++
++# build the sphinx documentation if available
++try:
++    import sphinx
++except ImportError:
++    sphinx = None
++if sphinx:
++    from sphinx.setup_command import BuildDoc
++    cmdclass['build_sphinx'] = BuildDoc
++
+ #################################################################
+ # Check various compiler/library properties
+ 
+@@ -346,7 +359,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': {'config-dir': 'Doc',
++                         'source-dir' : 'Doc'}
++        },
+        )
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..840d0b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-feature-forwarded-build-sphinx-documentation.patch

-- 
The Molecular Modelling Toolkit packaging



More information about the debian-science-commits mailing list