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

[morph at users.alioth.debian.org]

    Date: Tuesday, October 4, 2011 @ 11:43:49
  Author: morph
Revision: 18817

merge fix for #643857

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2011-10-04 11:40:00 UTC (rev 18816)
+++ packages/numpy/trunk/debian/changelog	2011-10-04 11:43:49 UTC (rev 18817)
@@ -42,6 +42,15 @@
 
  -- Sandro Tosi <morph at debian.org>  Fri, 16 Sep 2011 20:02:50 +0200
 
+python-numpy (1:1.5.1-3) unstable; urgency=low
+
+  * debian/rules
+    - make /u/b/f2py{,-dbg} real files (not symlink) with the shebang pointing
+      to unversioned python{,-dbg}, this makes the package more binNMU friendly;
+      thanks to Jakub Wilk for the report; Closes: #643857
+
+ -- Sandro Tosi <morph at debian.org>  Tue, 04 Oct 2011 11:43:55 +0200
+
 python-numpy (1:1.5.1-2) unstable; urgency=low
 
   * debian/rules

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2011-10-04 11:40:00 UTC (rev 18816)
+++ packages/numpy/trunk/debian/rules	2011-10-04 11:43:49 UTC (rev 18817)
@@ -35,8 +35,10 @@
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v-dbg," debian/tmp/usr/bin/f2py$$v-dbg; \
 	done
 	# install unversioned f2py script
-	dh_link usr/bin/f2py$(PYDEF) usr/bin/f2py
-	dh_link -ppython-numpy-dbg usr/bin/f2py$(PYDEF)-dbg usr/bin/f2py-dbg
+	cp -a debian/tmp/usr/bin/f2py$(PYDEF) debian/tmp/usr/bin/f2py
+	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python," debian/tmp/usr/bin/f2py
+	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
 
 	# moving those scripts away until after pysupport has run, to not
 	# generate depends on pythonx.y
@@ -83,9 +85,9 @@
 	dh_pysupport
 
 	# copy back f2py* bin, in their ultimate location
-	mv debian/tmp2/f2py?.? debian/python-numpy/usr/bin/
+	mv debian/tmp2/f2py?.? debian/tmp2/f2py debian/python-numpy/usr/bin/
 	mkdir -p debian/python-numpy-dbg/usr/bin/
-	mv debian/tmp2/f2py?.?-dbg debian/python-numpy-dbg/usr/bin/
+	mv debian/tmp2/f2py?.?-dbg debian/tmp2/f2py-dbg debian/python-numpy-dbg/usr/bin/
 
 	# GIGANTIC HACK - add back libnpymath.a
 	# get the file names, generate the new location, create the dir if missing, copy