[lmfit-py] 02/15: repare to use the system sphinx extensions

[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 lmfit-py.

commit bf22618907a5183b3c5672fccc07b58738777479
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Jul 26 11:37:23 2014 +0200

    repare to use the system sphinx extensions
---
 debian/control                                     |  3 ++-
 debian/copyright                                   | 20 ++-----------------
 ...the-internal-Ipython.sphinxext-extensions.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 +
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 085ccd3..f89681d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9),
                python-all,
                python-matplotlib,
                python-numpy,
+               python-numpydoc,
                python-scipy,
                python-setuptools,
                python-sphinx,
@@ -190,4 +191,4 @@ Description: Least-Squares Minimization with Constraints (Python 3)
  force search of the confidence intervals and correlations for sets of
  parameters.
  .
- This is the common documentation package.
\ No newline at end of file
+ This is the common documentation package.
diff --git a/debian/copyright b/debian/copyright
index 8de3920..39cd81c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: LM-Fit Development Team
 Upstream-Contact: matt.newville at gmail.com
 Source: http://lmfit.github.io/lmfit-py/
+Files-Excluded: doc/ext
 
 Files: debian/*
 Copyright: © 2014, Picca Frédéric-Emmanuel <picca at debian.org>
@@ -31,24 +32,7 @@ License: Expat
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THIS
  SOFTWARE.
 
-Files: ./doc/ext/ipython_console_highlighting.py
- ./doc/ext/ipython_directive.py
- ./doc/ext/numpydoc/__init__.py
- ./doc/ext/numpydoc/comment_eater.py
- ./doc/ext/numpydoc/compiler_unparse.py
- ./doc/ext/numpydoc/docscrape.py
- ./doc/ext/numpydoc/docscrape_sphinx.py
- ./doc/ext/numpydoc/numpydoc.py
- ./doc/ext/numpydoc/phantom_import.py
- ./doc/ext/numpydoc/plot_directive.py
- ./doc/ext/numpydoc/traitsdoc.py
- ./doc/sphinxext/apigen.py
- ./doc/sphinxext/docscrape.py
- ./doc/sphinxext/docscrape_sphinx.py
- ./doc/sphinxext/inheritance_diagram.py
- ./doc/sphinxext/ipython_console_highlighting.py
- ./doc/sphinxext/ipython_directive.py
- ./doc/sphinxext/numpydoc.py
+Files:
  ./lmfit/__init__.py
  ./lmfit/asteval.py
  ./lmfit/astutils.py
diff --git a/debian/patches/0001-use-the-internal-Ipython.sphinxext-extensions.patch b/debian/patches/0001-use-the-internal-Ipython.sphinxext-extensions.patch
new file mode 100644
index 0000000..0663fc8
--- /dev/null
+++ b/debian/patches/0001-use-the-internal-Ipython.sphinxext-extensions.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 26 Jul 2014 10:28:23 +0200
+Subject: use the internal Ipython.sphinxext extensions
+
+---
+ doc/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 27e19b2..2e7e248 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -25,8 +25,8 @@ extensions = ['sphinx.ext.autodoc',
+               'sphinx.ext.todo',
+               'sphinx.ext.coverage',
+               'sphinx.ext.pngmath',
+-              'ipython_directive',
+-              'ipython_console_highlighting',
++              'IPython.sphinxext.ipython_directive',
++              'IPython.sphinxext.ipython_console_highlighting',
+               'numpydoc']
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bcc80be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-use-the-internal-Ipython.sphinxext-extensions.patch
diff --git a/debian/rules b/debian/rules
index 996e120..8ef9237 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ export PYBUILD_NAME=lmfit
 override_dh_clean:
 	rm -rf doc/_static/conf_interval2.png
 	rm -rf doc/_static/conf_interval.png
+	rm -rf doc/ext
 	dh_clean
 
 override_dh_install:

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