[Python-modules-commits] r29115 - in packages/scipy/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, May 27, 2014 @ 23:50:05
  Author: jtaylor-guest
Revision: 29115

fix build of documentation in arch only builds

add latex for formulas

Modified:
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/python-scipy-doc.docs
  packages/scipy/trunk/debian/rules

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2014-05-27 23:50:03 UTC (rev 29114)
+++ packages/scipy/trunk/debian/control	2014-05-27 23:50:05 UTC (rev 29115)
@@ -7,7 +7,7 @@
            David Cournapeau <cournape at gmail.com>,
            Varun Hiremath <varun at debian.org>
 Build-Depends: cython (>= 0.19),
-               debhelper (>= 7.0.50~),
+               debhelper (>= 8.9.7~),
                gfortran,
                libblas-dev,
                liblapack-dev,
@@ -25,10 +25,12 @@
                python3-nose,
                python3-numpy (>= 1:1.7.2),
                python3-numpy-dbg
-Build-Depends-Indep:
-  python-docutils,
-  python-matplotlib,
-  python-sphinx,
+Build-Depends-Indep: dvipng,
+                     python-docutils,
+                     python-matplotlib,
+                     python-sphinx,
+                     texlive-latex-base,
+                     texlive-latex-extra
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.1
 Standards-Version: 3.9.5
@@ -39,10 +41,7 @@
 
 Package: python-scipy
 Architecture: any
-Depends: python-decorator,
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends}
+Depends: python-decorator, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Recommends: g++ | c++-compiler, python-dev, python-imaging
 Description: scientific tools for Python

Modified: packages/scipy/trunk/debian/python-scipy-doc.docs
===================================================================
--- packages/scipy/trunk/debian/python-scipy-doc.docs	2014-05-27 23:50:03 UTC (rev 29114)
+++ packages/scipy/trunk/debian/python-scipy-doc.docs	2014-05-27 23:50:05 UTC (rev 29115)
@@ -1 +1 @@
-build/sphinx/html
+doc/build/html

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2014-05-27 23:50:03 UTC (rev 29114)
+++ packages/scipy/trunk/debian/rules	2014-05-27 23:50:05 UTC (rev 29115)
@@ -10,9 +10,10 @@
 BASE=$(shell pwd)/debian
 DVER=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
 UVER=$(shell echo $(DVER) | sed "s/+dfsg.*//g")
+PYLIBPATH := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib")
 
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3
 
 override_dh_auto_clean:
 	rm -rf build
@@ -27,8 +28,15 @@
 	CFLAGS="-g -ggdb" python$*-dbg setup.py config_fc \
 				--noarch build;
 
+build: build-arch build-indep
+
+build-arch:
+	dh build --with=python2,python3
+
+build-indep:
+	(export MPLCONFIGDIR=. ; make -C doc html PYTHONPATH=../$(PYLIBPATH))
+
 override_dh_auto_build: $(PY2VERS:%=build-python%) $(PY3VERS:%=build-python%)
-	python setup.py build_sphinx
 
 install-python%:
 	python$* setup.py install --root $(BASE)/tmp \
@@ -94,5 +102,9 @@
 	dh_strip -ppython-scipy --dbg-package=python-scipy-dbg
 	dh_strip -ppython3-scipy --dbg-package=python3-scipy-dbg
 
+override_dh_installdocs-indep:
+	dh_installdocs -i
+	dh_sphinxdoc -i
+
 get-orig-source:
 	-uscan --force-download --download-version $(UVER) --rename