[Python-modules-commits] r9485 - in packages/numpy/trunk/debian (3 files)

[doko at users.alioth.debian.org]

    Date: Wednesday, August 26, 2009 @ 11:54:54
  Author: doko
Revision: 9485

  * Do not directly depend on the versioned python2.x packages, but
    keep the versioned interpreter names in the f2py2.x scripts. If these
    are needed with this dependency, then we need a new python-numpy-f2py
    package, for build requirements, a build-dependency on python-all-dev
    should be enough. Closes: #543456.

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2009-08-26 10:29:21 UTC (rev 9484)
+++ packages/numpy/trunk/debian/changelog	2009-08-26 11:54:54 UTC (rev 9485)
@@ -3,6 +3,13 @@
   [ Kumar Appaiah ]
   * Fix endianness detection. Closes: #543538.
 
+  [ Matthias Klose ]
+  * Do not directly depend on the versioned python2.x packages, but
+    keep the versioned interpreter names in the f2py2.x scripts. If these
+    are needed with this dependency, then we need a new python-numpy-f2py
+    package, for build requirements, a build-dependency on python-all-dev
+    should be enough. Closes: #543456.
+
  -- Matthias Klose <doko at debian.org>  Wed, 26 Aug 2009 11:40:33 +0200
 
 python-numpy (1:1.3.0-1) unstable; urgency=low

Modified: packages/numpy/trunk/debian/python-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy.install	2009-08-26 10:29:21 UTC (rev 9484)
+++ packages/numpy/trunk/debian/python-numpy.install	2009-08-26 11:54:54 UTC (rev 9485)
@@ -1,15 +1,14 @@
-usr/lib/python*/site-packages/numpy/*.py
-usr/lib/python*/site-packages/numpy/core/
-usr/lib/python*/site-packages/numpy/distutils/
-usr/lib/python*/site-packages/numpy/lib/
-usr/lib/python*/site-packages/numpy/testing/
-usr/lib/python*/site-packages/numpy/oldnumeric/
-usr/lib/python*/site-packages/numpy/numarray/
-usr/lib/python*/site-packages/numpy/fft/
-usr/lib/python*/site-packages/numpy/linalg/
-usr/lib/python*/site-packages/numpy/random/
-usr/lib/python*/site-packages/numpy/ma/
-usr/bin/f2py*
-usr/lib/python*/site-packages/numpy/f2py/*.py
-usr/lib/python*/site-packages/numpy/f2py/src
-usr/lib/python*/site-packages/*.egg-info
+usr/lib/python*/*-packages/numpy/*.py
+usr/lib/python*/*-packages/numpy/core/
+usr/lib/python*/*-packages/numpy/distutils/
+usr/lib/python*/*-packages/numpy/lib/
+usr/lib/python*/*-packages/numpy/testing/
+usr/lib/python*/*-packages/numpy/oldnumeric/
+usr/lib/python*/*-packages/numpy/numarray/
+usr/lib/python*/*-packages/numpy/fft/
+usr/lib/python*/*-packages/numpy/linalg/
+usr/lib/python*/*-packages/numpy/random/
+usr/lib/python*/*-packages/numpy/ma/
+usr/lib/python*/*-packages/numpy/f2py/*.py
+usr/lib/python*/*-packages/numpy/f2py/src
+usr/lib/python*/*-packages/*.egg-info

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2009-08-26 10:29:21 UTC (rev 9484)
+++ packages/numpy/trunk/debian/rules	2009-08-26 11:54:54 UTC (rev 9485)
@@ -29,13 +29,14 @@
 clean::
 	-rm -rf `find -name build -type d`
 	-rm -rf `find . -name "*.pyc" -type f`
+	rm -rf debian/tmp2
 
 install/python-numpy::
 	: # Adding documentation
 	install -d $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy
-	cp -r $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/* \
+	cp -r $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/*-packages/numpy/doc/* \
 		$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/
-	#cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/README.txt \
+	#cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/*-packages/numpy/doc/README.txt \
 	#	$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/README.doc.txt
 
 	: # Adding links to manpages
@@ -49,6 +50,11 @@
 	: # Add unversioned numpy script
 	ln -s f2py$(cdbs_python_current_version) debian/python-numpy/usr/bin/f2py
 
+	: # move versioned f2py binaries out of the way, we don't want to have explicit
+	: # dependencies on python2.x.
+	mkdir -p debian/tmp2
+	mv debian/tmp/usr/bin/f2py?.? debian/tmp2/
+
 	: # Make Python scripts executable
 	for i in `find debian/tmp/usr/lib -type f`; do \
 	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
@@ -97,6 +103,9 @@
 	find debian/python-numpy-dbg -depth -empty -exec rmdir {} \;
 
 binary-predeb/python-numpy-dbg::
+	: # restore versioned f2py binaries
+	mv debian/tmp2/f2py?.? debian/python-numpy/usr/bin/
+
 	rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg
 	ln -s python-numpy debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg