[Python-modules-commits] r20820 - in packages/numpy/trunk/debian (7 files)

morph at users.alioth.debian.org morph at users.alioth.debian.org
Fri Mar 16 22:22:12 UTC 2012 

    Date: Friday, March 16, 2012 @ 22:22:11
  Author: morph
Revision: 20820

Add package for Python 3; Closes: #601593

Added:
  packages/numpy/trunk/debian/python3-numpy-dbg.install
  packages/numpy/trunk/debian/python3-numpy.install
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/python-numpy-dbg.install
  packages/numpy/trunk/debian/python-numpy.install
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2012-03-16 21:28:41 UTC (rev 20819)
+++ packages/numpy/trunk/debian/changelog	2012-03-16 22:22:11 UTC (rev 20820)
@@ -1,3 +1,10 @@
+python-numpy (1:1.6.1-6) UNRELEASED; urgency=low
+
+  [ Thomas Kluyver ]
+  * Add package for Python 3; Closes: #601593
+
+ -- Sandro Tosi <morph at debian.org>  Fri, 16 Mar 2012 23:12:56 +0100
+
 python-numpy (1:1.6.1-5) experimental; urgency=low
 
   * debian/versions

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2012-03-16 21:28:41 UTC (rev 20819)
+++ packages/numpy/trunk/debian/control	2012-03-16 22:22:11 UTC (rev 20820)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: python-all-dev, python-all-dbg, python-support (>= 1), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, quilt, python-sphinx (>= 1.0.7+dfsg), python-matplotlib, python-nose
+Build-Depends: python-all-dev, python-all-dbg, python-support (>= 1), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, quilt, python-sphinx (>= 1.0.7+dfsg), python-matplotlib, python-nose, python3-all-dev, python3-all-dbg, python3-nose
 XS-Python-Version: >= 2.4
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk
@@ -42,6 +42,40 @@
  .
  This package contains the extension built for the Python debug interpreter.
 
+Package: python3-numpy
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: python-numpy-doc, python3-numpy-dbg, python3-nose (>= 0.10.1), python3-dev, gfortran
+Provides: ${python3:Provides}, ${numpy:Provides}, python3-numpy-dev, python3-f2py
+Description: Numerical Python adds a fast array facility to the Python language
+ Numpy contains a powerful N-dimensional array object, sophisticated
+ (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, and useful linear algebra, Fourier transform, and random number
+ capabilities.
+ .
+ Numpy replaces the python-numeric and python-numarray modules which are
+ now deprecated and shouldn't be used except to support older
+ software.
+ .
+ This package contains Numpy for Python 3.
+
+Package: python3-numpy-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python3-numpy (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: Fast array facility to the Python language (debug extension)
+ Numpy contains a powerful N-dimensional array object, sophisticated
+ (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, and useful linear algebra, Fourier transform, and random number
+ capabilities.
+ .
+ Numpy replaces the python-numeric and python-numarray modules which
+ are now deprecated and shouldn't be used except to support older
+ software.
+ .
+ This package contains the extension built for the Python 3 debug interpreter.
+
 Package: python-numpy-doc
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Section: doc

Modified: packages/numpy/trunk/debian/python-numpy-dbg.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy-dbg.install	2012-03-16 21:28:41 UTC (rev 20819)
+++ packages/numpy/trunk/debian/python-numpy-dbg.install	2012-03-16 22:22:11 UTC (rev 20820)
@@ -1 +1 @@
-usr/lib/python*/*-packages/*/*/*_d.so
+usr/lib/python2*/*-packages/*/*/*_d.so

Modified: packages/numpy/trunk/debian/python-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy.install	2012-03-16 21:28:41 UTC (rev 20819)
+++ packages/numpy/trunk/debian/python-numpy.install	2012-03-16 22:22:11 UTC (rev 20820)
@@ -1,22 +1,22 @@
 debian/dh_numpy usr/bin
 debian/versions usr/share/numpy/
-usr/lib/python*/*-packages/*/*/*[!_][!_].so
-usr/lib/python*/*-packages/*/*/*/libnpymath.a
-usr/lib/python*/*-packages/*/*.py
-usr/lib/python*/*-packages/*.egg-info
-usr/lib/python*/*-packages/numpy/*.py
-usr/lib/python*/*-packages/numpy/compat/
-usr/lib/python*/*-packages/numpy/core/
-usr/lib/python*/*-packages/numpy/distutils/
-usr/lib/python*/*-packages/numpy/f2py/*.py
-usr/lib/python*/*-packages/numpy/f2py/src
-usr/lib/python*/*-packages/numpy/fft/
-usr/lib/python*/*-packages/numpy/lib/
-usr/lib/python*/*-packages/numpy/linalg/
-usr/lib/python*/*-packages/numpy/ma/
-usr/lib/python*/*-packages/numpy/matrixlib/
-usr/lib/python*/*-packages/numpy/numarray/
-usr/lib/python*/*-packages/numpy/oldnumeric/
-usr/lib/python*/*-packages/numpy/polynomial/
-usr/lib/python*/*-packages/numpy/random/
-usr/lib/python*/*-packages/numpy/testing/
+usr/lib/python2*/*-packages/*/*/*[!_][!_].so
+usr/lib/python2*/*-packages/*/*/*/libnpymath.a
+usr/lib/python2*/*-packages/*/*.py
+usr/lib/python2*/*-packages/*.egg-info
+usr/lib/python2*/*-packages/numpy/*.py
+usr/lib/python2*/*-packages/numpy/compat/
+usr/lib/python2*/*-packages/numpy/core/
+usr/lib/python2*/*-packages/numpy/distutils/
+usr/lib/python2*/*-packages/numpy/f2py/*.py
+usr/lib/python2*/*-packages/numpy/f2py/src
+usr/lib/python2*/*-packages/numpy/fft/
+usr/lib/python2*/*-packages/numpy/lib/
+usr/lib/python2*/*-packages/numpy/linalg/
+usr/lib/python2*/*-packages/numpy/ma/
+usr/lib/python2*/*-packages/numpy/matrixlib/
+usr/lib/python2*/*-packages/numpy/numarray/
+usr/lib/python2*/*-packages/numpy/oldnumeric/
+usr/lib/python2*/*-packages/numpy/polynomial/
+usr/lib/python2*/*-packages/numpy/random/
+usr/lib/python2*/*-packages/numpy/testing/

Added: packages/numpy/trunk/debian/python3-numpy-dbg.install
===================================================================
--- packages/numpy/trunk/debian/python3-numpy-dbg.install	                        (rev 0)
+++ packages/numpy/trunk/debian/python3-numpy-dbg.install	2012-03-16 22:22:11 UTC (rev 20820)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so

Added: packages/numpy/trunk/debian/python3-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python3-numpy.install	                        (rev 0)
+++ packages/numpy/trunk/debian/python3-numpy.install	2012-03-16 22:22:11 UTC (rev 20820)
@@ -0,0 +1,20 @@
+usr/lib/python3*/*-packages/*/*/*.cpython-3?[!d]*.so
+usr/lib/python3*/*-packages/*/*/*/libnpymath.a
+usr/lib/python3*/*-packages/*/*.py
+usr/lib/python3*/*-packages/*.egg-info
+usr/lib/python3*/*-packages/numpy/*.py
+usr/lib/python3*/*-packages/numpy/compat/
+usr/lib/python3*/*-packages/numpy/core/
+usr/lib/python3*/*-packages/numpy/distutils/
+usr/lib/python3*/*-packages/numpy/f2py/*.py
+usr/lib/python3*/*-packages/numpy/f2py/src
+usr/lib/python3*/*-packages/numpy/fft/
+usr/lib/python3*/*-packages/numpy/lib/
+usr/lib/python3*/*-packages/numpy/linalg/
+usr/lib/python3*/*-packages/numpy/ma/
+usr/lib/python3*/*-packages/numpy/matrixlib/
+usr/lib/python3*/*-packages/numpy/numarray/
+usr/lib/python3*/*-packages/numpy/oldnumeric/
+usr/lib/python3*/*-packages/numpy/polynomial/
+usr/lib/python3*/*-packages/numpy/random/
+usr/lib/python3*/*-packages/numpy/testing/

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2012-03-16 21:28:41 UTC (rev 20819)
+++ packages/numpy/trunk/debian/rules	2012-03-16 22:22:11 UTC (rev 20820)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-PYVERS=$(shell pyversions -vr debian/control)
+PYVERS=$(shell pyversions -vr debian/control) $(shell py3versions -vr debian/control)
+PYTHON3=$(shell py3versions -vr)
 PYDEF=$(shell pyversions -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")
 
@@ -10,8 +11,15 @@
 export ATLAS=None
 
 %:
-	dh $@ --with sphinxdoc
+	dh $@ --with sphinxdoc,python3
 
+override_dh_auto_build:
+	dh_auto_build
+	for v in $(PYTHON3); do \
+		python$$v setup.py build; \
+		python$$v-dbg setup.py build; \
+	done
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf `find -name build -type d`
@@ -76,6 +84,10 @@
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -ppython-numpy --dbg-package=python-numpy-dbg
+	dh_strip -ppython3-numpy --dbg-package=python3-numpy-dbg
+	# dh_strip seemingly doesn't catch the PEP 3149-style debug names
+	rm debian/python3-numpy/usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so
+	
 	# fix python-debug-in-wrong-location lintian warning
 	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
 endif
@@ -85,9 +97,14 @@
 	dh_pysupport
 
 	# copy back f2py* bin, in their ultimate location
-	mv debian/tmp2/f2py?.? debian/tmp2/f2py debian/python-numpy/usr/bin/
+	mv debian/tmp2/f2py2.? debian/tmp2/f2py debian/python-numpy/usr/bin/
 	mkdir -p debian/python-numpy-dbg/usr/bin/
-	mv debian/tmp2/f2py?.?-dbg debian/tmp2/f2py-dbg debian/python-numpy-dbg/usr/bin/
+	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/
+	mkdir -p debian/python3-numpy-dbg/usr/bin/
+	mv 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
@@ -120,6 +137,13 @@
 
 override_dh_auto_install:
 	dh_auto_install
+	
+	# Install for Python 3
+	for v in $(PYTHON3); do \
+		python$$v setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+		python$$v-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done
+	
 	# yes, we need to run tests after install
 	# The reason is that numpy tries hard to not let you run it from the
 	# source directory, so we need to mess with the import order so to

More information about the Python-modules-commits mailing list