[Python-modules-commits] r30471 - in packages/numpy/trunk/debian (4 files)

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

    Date: Tuesday, September 2, 2014 @ 20:04:40
  Author: jtaylor-guest
Revision: 30471

f2py documentation moved to same tree as the rest

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/python-numpy-doc.install
  packages/numpy/trunk/debian/python-numpy.manpages
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2014-09-02 20:04:36 UTC (rev 30470)
+++ packages/numpy/trunk/debian/changelog	2014-09-02 20:04:40 UTC (rev 30471)
@@ -1,6 +1,8 @@
 python-numpy (1:1.9.0~rc1-1) experimental; urgency=medium
 
   * New upstream release candidate
+  * debian/{rules,python-numpy-doc.install,python-numpy.manpages}:
+    f2py documentation moved to same tree as the rest
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 27 Aug 2014 19:35:20 +0200
 

Modified: packages/numpy/trunk/debian/python-numpy-doc.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy-doc.install	2014-09-02 20:04:36 UTC (rev 30470)
+++ packages/numpy/trunk/debian/python-numpy-doc.install	2014-09-02 20:04:40 UTC (rev 30471)
@@ -1,4 +1,2 @@
-/numpy/f2py/docs/* /usr/share/doc/python-numpy-doc/f2py/
 doc/build/html /usr/share/doc/python-numpy-doc/
 numpy/doc/*.py /usr/share/doc/python-numpy-doc/
-numpy/f2py/docs/usersguide/index.html /usr/share/doc/python-numpy-doc/f2py/

Modified: packages/numpy/trunk/debian/python-numpy.manpages
===================================================================
--- packages/numpy/trunk/debian/python-numpy.manpages	2014-09-02 20:04:36 UTC (rev 30470)
+++ packages/numpy/trunk/debian/python-numpy.manpages	2014-09-02 20:04:40 UTC (rev 30471)
@@ -1,2 +1,2 @@
-numpy/f2py/f2py.1
+doc/f2py/f2py.1
 debian/dh_numpy.1

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2014-09-02 20:04:36 UTC (rev 30470)
+++ packages/numpy/trunk/debian/rules	2014-09-02 20:04:40 UTC (rev 30471)
@@ -32,8 +32,8 @@
 	rm -f numpy/random/mtrand/mtrand.c
 
 override_dh_installman:
-	dh_installman -ppython-numpy numpy/f2py/f2py.1
-	dh_installman -ppython3-numpy numpy/f2py/f2py.1
+	dh_installman -ppython-numpy doc/f2py/f2py.1
+	dh_installman -ppython3-numpy doc/f2py/f2py.1
 	mv debian/python3-numpy/usr/share/man/man1/f2py.1 \
 	  debian/python3-numpy/usr/share/man/man1/f2py3.1
 	# link manpage for versioned and dbg incarnations of f2py
@@ -139,7 +139,6 @@
 build-indep: 
 	# build doc only for default python version
 	(export MPLCONFIGDIR=. ; make -C doc html PYTHONPATH=../$(PYLIBPATH))
-	rst2html numpy/f2py/docs/usersguide/index.txt > numpy/f2py/docs/usersguide/index.html
 
 update_intersphinx_mapping:
 	wget http://docs.python.org/dev/objects.inv -O debian/python.org_objects.inv