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

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

    Date: Wednesday, November 25, 2009 @ 23:45:53
  Author: jwilk-guest
Revision: 10594

* Add --prefix=/usr to setup.py in order to appease Python >= 2.6.
* Move f2pyX.Y-dbg manpages from python-numpy to python-numpy-dbg.
* Actually build f2pyX.Y-dbg and f2py-dbg binaries.
* Fix shebangs for f2py* binaries.

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	2009-11-25 16:05:34 UTC (rev 10593)
+++ packages/numpy/trunk/debian/changelog	2009-11-25 23:45:53 UTC (rev 10594)
@@ -12,8 +12,14 @@
     + debian/rules: Remove CDBS' quilt related calls.
     + Add debian/source/format which says "3.0 (quilt)".
 
- -- Kumar Appaiah <akumar at debian.org>  Thu, 05 Nov 2009 08:31:31 -0600
+  [ Jakub Wilk ]
+  * Add --prefix=/usr to setup.py in order to appease Python >= 2.6.
+  * Move f2pyX.Y-dbg manpages from python-numpy to python-numpy-dbg.
+  * Actually build f2pyX.Y-dbg and f2py-dbg binaries.
+  * Fix shebangs for f2py* binaries.
 
+ -- Jakub Wilk <ubanus at users.sf.net>  Thu, 26 Nov 2009 00:39:40 +0100
+
 python-numpy (1:1.3.0-3) unstable; urgency=low
 
   [ Kumar Appaiah ]

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2009-11-25 16:05:34 UTC (rev 10593)
+++ packages/numpy/trunk/debian/control	2009-11-25 23:45:53 UTC (rev 10594)
@@ -33,6 +33,7 @@
 Section: debug
 Architecture: any
 Depends: python-numpy (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
+Replaces: python-numpy (<< 1:1.3.0-4)
 XB-Python-Version: ${python:Versions}
 Description: Fast array facility to the Python language (debug extension)
  Numpy contains a powerful N-dimensional array object, sophisticated

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2009-11-25 16:05:34 UTC (rev 10593)
+++ packages/numpy/trunk/debian/rules	2009-11-25 23:45:53 UTC (rev 10594)
@@ -40,8 +40,7 @@
 	mkdir -p debian/python-numpy/usr/share/man/man1
 	for v in $(PYVERS); do \
 	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v.1; \
-	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v-dbg.1; \
-	  sed -i "1s/python[^ ]*/python$$v/" debian/tmp/usr/bin/f2py$$v; \
+	  sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v," debian/tmp/usr/bin/f2py$$v; \
 	done
 
 	: # Add unversioned numpy script
@@ -93,11 +92,21 @@
 
 install/python-numpy-dbg::
 	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-numpy-dbg; \
+	  python$$i-dbg ./setup.py install --prefix=/usr --root $(CURDIR)/debian/python-numpy-dbg; \
+	  ( cd debian/python-numpy-dbg/usr/bin/; \
+	    sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$i-dbg," f2py$$i; \
+	    mv f2py$$i f2py$$i-dbg; \
+	  ); \
 	done
 	find debian/python-numpy-dbg \
-		! -type d ! -name '*_d.so' | xargs rm -f
+		! -type d ! -name '*_d.so' ! -name 'f2py*-dbg' | xargs rm -f
 	find debian/python-numpy-dbg -depth -empty -exec rmdir {} \;
+	mkdir -p debian/python-numpy-dbg/usr/share/man/man1
+	for v in $(PYVERS); do \
+	  ln -sf f2py.1 debian/python-numpy-dbg/usr/share/man/man1/f2py$$v-dbg.1; \
+	done
+	ln -sf f2py.1 debian/python-numpy-dbg/usr/share/man/man1/f2py-dbg.1
+	ln -sf f2py$(cdbs_python_current_version)-dbg debian/python-numpy-dbg/usr/bin/f2py-dbg
 
 binary-predeb/python-numpy-dbg::
 	: # restore versioned f2py binaries