[Python-modules-commits] r33993 - in packages/scipy/trunk/debian (changelog rules)

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

    Date: Monday, August 24, 2015 @ 22:32:11
  Author: jcjaskula-guest
Revision: 33993

Reenable overrid_dh_installdocs-indep to fix build of documentation in arch only builds

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/rules

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2015-08-24 22:15:46 UTC (rev 33992)
+++ packages/scipy/trunk/debian/changelog	2015-08-24 22:32:11 UTC (rev 33993)
@@ -1,7 +1,11 @@
 python-scipy (0.16.0-2) unstable; urgency=medium
 
+  [ Julian Taylor ]
   * bump cython build-depend to required 0.22
 
+  [ Jean-Christophe Jaskula ]
+  * fix build of documentation in arch only builds
+
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 24 Aug 2015 09:51:10 +0200
 
 python-scipy (0.16.0-1) unstable; urgency=medium

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2015-08-24 22:15:46 UTC (rev 33992)
+++ packages/scipy/trunk/debian/rules	2015-08-24 22:32:11 UTC (rev 33993)
@@ -13,7 +13,7 @@
 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
@@ -65,6 +65,9 @@
 	done
 	ln -sf /usr/lib/python3/dist-packages/decorator.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/_lib/decorator.py
 
+	# not ported to py3 in 0.10.1
+	rm -rf $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/weave
+
 	dh_numpy
 	dh_numpy3
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -102,7 +105,9 @@
 	dh_strip -ppython-scipy --dbg-package=python-scipy-dbg
 	dh_strip -ppython3-scipy --dbg-package=python3-scipy-dbg
 
-override_dh_sphinxdoc:
+override_dh_installdocs-indep:
+	dh_installdocs -i
+
 	rm -rf debian/python-scipy-doc/usr/share/doc/python-scipy-doc/html/_static/jquery.js
 	dh_link -ppython-scipy-doc /usr/share/javascript/jquery/jquery.js /usr/share/doc/python-scipy-doc/html/_static/jquery.js
 
@@ -110,7 +115,7 @@
 	dh_link -ppython-scipy-doc /usr/share/javascript/underscore/underscore.js /usr/share/doc/python-scipy-doc/html/_static/underscore.js
 
 	dh_link -ppython-scipy-doc /usr/share/javascript/mathjax/MathJax.js /usr/share/doc/python-scipy-doc/html/_static/MathJax.js
-	dh_sphinxdoc
+	dh_sphinxdoc -i
 
 get-orig-source:
 	-uscan --force-download --download-version $(UVER) --rename