[pyfai] 08/19: fix the FTBFS with sphinx

[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 pyfai.

commit 73d8b8224750c56d18241efaa317ef768e26071b
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Jul 31 16:51:40 2017 +0200

    fix the FTBFS with sphinx
---
 debian/changelog                                   |  2 ++
 .../0002-remove-useless-logic-in-conf.py.patch     | 30 ++++++++++++++++++++++
 debian/patches/0003-use-the-system-mathjax.patch   |  4 +--
 debian/patches/series                              |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 718ff90..2cbf9d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pyfai (0.14.0+dfsg-1) unstable; urgency=medium
   * debian/control
     - Bump Standrad-Version 3.9.8 (nothing to do)
     - fix Build-Depends/Depends with cme
+  * debian/patches
+    - 0002-remove-useless-logic-in-conf.py.patch (Added)
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 31 Jul 2017 13:40:50 +0200
 
diff --git a/debian/patches/0002-remove-useless-logic-in-conf.py.patch b/debian/patches/0002-remove-useless-logic-in-conf.py.patch
new file mode 100644
index 0000000..72f85d1
--- /dev/null
+++ b/debian/patches/0002-remove-useless-logic-in-conf.py.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Mon, 31 Jul 2017 16:50:54 +0200
+Subject: remove useless logic in conf.py
+
+---
+ doc/source/conf.py | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index ea362ea..a118acd 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -60,16 +60,6 @@ source_suffix = '.rst'
+ # The master toctree document.
+ master_doc = 'index'
+ 
+-# Configure the environment to be able to use sphinxcontrib.programoutput
+-# NOTE: Must be done after pyFAI._version import which at the end of the end imports PyMCA
+-# Importing PyMCA redefine and reorder PYTHONPATH
+-import glob
+-root_dir = os.path.abspath("../..")
+-build_dir = glob.glob('../../build/lib*')
+-
+-sys.path.insert(1, build_dir[0])
+-os.environ["PYTHONPATH"] = os.path.abspath(build_dir[0]) + os.pathsep + os.environ.get("PYTHONPATH", "")
+-
+ # General information about the project.
+ project = u'pyFAI'
+ from pyFAI._version import strictversion, version, __date__ as pyfai_date
diff --git a/debian/patches/0003-use-the-system-mathjax.patch b/debian/patches/0003-use-the-system-mathjax.patch
index fafeaed..9a79162 100644
--- a/debian/patches/0003-use-the-system-mathjax.patch
+++ b/debian/patches/0003-use-the-system-mathjax.patch
@@ -8,10 +8,10 @@ Subject: use the system mathjax
  1 file changed, 6 insertions(+)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 3b2cead..dd312ea 100644
+index cc41d41..ea362ea 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -200,6 +200,12 @@ html_static_path = ['_static']
+@@ -201,6 +201,12 @@ html_static_path = ['_static']
  htmlhelp_basename = 'pyFAIdoc'
  
  
diff --git a/debian/patches/series b/debian/patches/series
index c81655a..3edfb87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0003-use-the-system-mathjax.patch
+0002-remove-useless-logic-in-conf.py.patch

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