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

[morph at users.alioth.debian.org]

    Date: Friday, August 31, 2012 @ 08:51:24
  Author: morph
Revision: 22614

* debian/rules
  - install f2py3 command and relative manpages; thanks to Julian Taylor for
    the report and patch; Closes: #675694

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2012-08-30 09:55:51 UTC (rev 22613)
+++ packages/numpy/trunk/debian/changelog	2012-08-31 08:51:24 UTC (rev 22614)
@@ -1,3 +1,11 @@
+python-numpy (1:1.6.2-2) UNRELEASED; urgency=low
+
+  * debian/rules
+    - install f2py3 command and relative manpages; thanks to Julian Taylor for
+      the report and patch; Closes: #675694
+
+ -- Sandro Tosi <morph at debian.org>  Sat, 02 Jun 2012 20:04:25 +0200
+
 python-numpy (1:1.6.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2012-08-30 09:55:51 UTC (rev 22613)
+++ packages/numpy/trunk/debian/rules	2012-08-31 08:51:24 UTC (rev 22614)
@@ -3,6 +3,7 @@
 PY2VERS=$(shell pyversions -vr debian/control)
 PY3VERS=$(shell py3versions -vr)
 PYDEF=$(shell pyversions -dv)
+PY3DEF=$(shell py3versions -dv)
 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")
 
 # Look at #634012 to understand why is needed and what will happen if we set
@@ -28,17 +29,21 @@
 	rm -rf doc/fontList.cache numpy/f2py/docs/usersguide/index.html
 
 override_dh_installman:
-	dh_installman numpy/f2py/f2py.1
+	dh_installman -ppython-numpy numpy/f2py/f2py.1
+	dh_installman -ppython3-numpy numpy/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
 	for v in $(PY2VERS); do \
 		dh_link /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
 		dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
 	done
 	for v in $(PY3VERS); do \
-		dh_link -ppython3-numpy /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
-		dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
+		dh_link -ppython3-numpy /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
+		dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
 	done
 	dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py-dbg.1.gz;
+	dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py3-dbg.1.gz;
 
 override_dh_install:
 	# add shebang information to f2py script
@@ -53,6 +58,11 @@
 	cp -a debian/tmp/usr/bin/f2py$(PYDEF)-dbg debian/tmp/usr/bin/f2py-dbg
 	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python-dbg," debian/tmp/usr/bin/f2py-dbg
 
+	cp -a debian/tmp/usr/bin/f2py$(PY3DEF) debian/tmp/usr/bin/f2py3
+	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python3," debian/tmp/usr/bin/f2py3
+	cp -a debian/tmp/usr/bin/f2py$(PY3DEF)-dbg debian/tmp/usr/bin/f2py3-dbg
+	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python3-dbg," debian/tmp/usr/bin/f2py3-dbg
+
 	# moving those scripts away until after pysupport has run, to not
 	# generate depends on pythonx.y
 	mkdir debian/tmp2
@@ -121,9 +131,9 @@
 	mv debian/tmp2/f2py2.?-dbg debian/tmp2/f2py-dbg debian/python-numpy-dbg/usr/bin/
 	
 	mkdir -p debian/python3-numpy/usr/bin/
-	mv debian/tmp2/f2py3.? debian/python3-numpy/usr/bin/
+	mv debian/tmp2/f2py3.? debian/tmp2/f2py3 debian/python3-numpy/usr/bin/
 	mkdir -p debian/python3-numpy-dbg/usr/bin/
-	mv debian/tmp2/f2py3.?-dbg debian/python3-numpy-dbg/usr/bin/
+	mv debian/tmp2/f2py3.?-dbg debian/tmp2/f2py3-dbg debian/python3-numpy-dbg/usr/bin/
 
 	# GIGANTIC HACK - add back libnpymath.a
 	# get the file names, generate the new location, create the dir if missing, copy