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

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

The following commit has been merged in the master branch:
commit cd1da3b3fa2e7a5107e66180e50989954026bd6c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Sep 21 22:53:12 2011 +0200

    import the new upstream version which include our patches.

diff --git a/debian/changelog b/debian/changelog
index 5ff8156..989c268 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-mmtk (2.7.5~beta-1) unstable; urgency=low
+mmtk (2.7.5~beta2-1) unstable; urgency=low
 
   * Initial release (Closes: #xxxxxx)
 
- -- Picca Fr&édéric-Emmanuel <picca at debian.org>  Tue, 20 Sep 2011 16:58:22 +0200
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 20 Sep 2011 16:58:22 +0200
diff --git a/debian/patches/0001-feature-fix-the-sphinx-build-target.patch b/debian/patches/0001-feature-fix-the-sphinx-build-target.patch
deleted file mode 100644
index b9c5b82..0000000
--- a/debian/patches/0001-feature-fix-the-sphinx-build-target.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?=
- <picca at synchrotron-soleil.fr>
-Date: Tue, 20 Sep 2011 17:18:58 +0200
-Subject: feature fix the sphinx build target
-
----
- setup.py |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3301948..857b176 100644
---- a/setup.py
-+++ b/setup.py
-@@ -378,4 +378,9 @@ standard and non-standard problems in molecular simulations.
-        scripts = ['tviewer'],
- 
-        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 032db53..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-feature-fix-the-sphinx-build-target.patch

-- 
The Molecular Modelling Toolkit packaging