[Python-modules-commits] r28173 - in packages/numpy/trunk/debian (changelog control rules)

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

    Date: Thursday, March 13, 2014 @ 17:49:57
  Author: jtaylor-guest
Revision: 28173

fix -arch build by only calling dh_sphinxdoc in -indep

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2014-03-13 07:52:39 UTC (rev 28172)
+++ packages/numpy/trunk/debian/changelog	2014-03-13 17:49:57 UTC (rev 28173)
@@ -1,3 +1,9 @@
+python-numpy (1:1.8.1~rc1-2) unstable; urgency=medium
+
+  * fix -arch build by only calling dh_sphinxdoc in -indep
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 13 Mar 2014 18:40:56 +0100
+
 python-numpy (1:1.8.1~rc1-1) unstable; urgency=low
 
   * New upstream bugfix release candidate

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2014-03-13 07:52:39 UTC (rev 28172)
+++ packages/numpy/trunk/debian/control	2014-03-13 17:49:57 UTC (rev 28173)
@@ -5,7 +5,7 @@
 Uploaders: Sandro Tosi <morph at debian.org>,
            Julian Taylor <jtaylor.debian at googlemail.com>
 Build-Depends: cython,
-               debhelper (>= 7.0.50~),
+               debhelper (>= 8.9.7~),
                gfortran (>= 4:4.2),
                libblas-dev [!arm !m68k],
                liblapack-dev [!arm !m68k],

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2014-03-13 07:52:39 UTC (rev 28172)
+++ packages/numpy/trunk/debian/rules	2014-03-13 17:49:57 UTC (rev 28173)
@@ -12,7 +12,7 @@
 export ATLAS=None
 
 %:
-	dh $@ --with sphinxdoc,python2,python3
+	dh $@ --with python2,python3
 
 override_dh_auto_build:
 	cd numpy/random/mtrand && python generate_mtrand_c.py
@@ -126,7 +126,8 @@
 	-mv debian/python-numpy/usr/share/pyshared/numpy/core/lib/libnpymath.a \
 		debian/python-numpy/usr/lib/python2.7/dist-packages/numpy/core/lib/libnpymath.a
 
-override_dh_sphinxdoc:
+override_dh_installdocs-indep:
+	dh_installdocs -i
 	dh_sphinxdoc -i
 
 build: build-arch build-indep ;