Merge lp:~jtaylor/ubuntu/precise/python-numpy/python3-numpy into lp:ubuntu/precise/python-numpy

[Julian Taylor]

[Jamie Strandboge (jdstrand)]

This is in precise now: 1:1.6.1-6ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-19 06:50:35 +0000
+++ debian/changelog	2012-03-19 18:48:19 +0000
@@ -1,3 +1,34 @@
+python-numpy (1:1.6.1-6ubuntu1) precise; urgency=low
+
+  * Merge from Debian unstable, adds python3 package (LP: #795605, #959588)
+    Remaining changes:
+    - debian/patches/20_disable-plot-extension.patch
+       Disable plot_directive extension, and catch ImportErrors when
+       matplotlib cannot be imported, which allows us to remove
+       python-matplotlib from dependencies.  This is required because
+       python-numpy is in main, while python-matplotlib is in universe.
+    - Build using dh_python2
+      add bin/f2py* to .install files
+    - keep Replaces: python-numpy (<< 1:1.3.0-4) in python-numpy-dbg
+      for lucid upgrades
+    - debian/patches/search-multiarch-paths.patch: (LP: #818867)
+       add multiarch libdirs to numpy.distutils.system_info
+
+ -- Julian Taylor <[e-mail]>  Mon, 19 Mar 2012 19:38:13 +0100
+
+python-numpy (1:1.6.1-6) experimental; urgency=low
+
+  [ Thomas Kluyver ]
+  * Add package for Python 3; Closes: #601593
+
+  [ Sandro Tosi ]
+  * Small fixes for python3 packaging
+  * debian/control
+    - bump Standards-Version to 3.9.3 (no changes needed)
+    - remove quild from b-d, not needed since using 3.0 (quilt) format
+
+ -- Sandro Tosi <[e-mail]>  Sat, 17 Mar 2012 13:05:04 +0100
+
 python-numpy (1:1.6.1-5ubuntu2) precise; urgency=low
 
   * update search-multiarch-paths.patch (LP: #956901)

=== modified file 'debian/control'
--- debian/control	2012-03-16 19:28:26 +0000
+++ debian/control	2012-03-19 18:48:19 +0000
@@ -4,9 +4,10 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Sandro Tosi <[e-mail]>
-Build-Depends: python-all-dev (>= 2.6.6-3~), python-all-dbg, 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-nose
-XS-Python-Version: >= 2.4
-Standards-Version: 3.9.2
+Build-Depends: python-all-dev (>= 2.6.6-3~), python-all-dbg, gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, python-sphinx (>= 1.0.7+dfsg), python-nose, python3-all-dev, python3-all-dbg, python3-nose
+X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/numpy/trunk/
 Homepage: http://numpy.scipy.org/
@@ -45,6 +46,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 file 'debian/python-numpy-dbg.install'
--- debian/python-numpy-dbg.install	2012-02-11 12:55:21 +0000
+++ debian/python-numpy-dbg.install	2012-03-19 18:48:19 +0000
@@ -1,3 +1,3 @@
 usr/bin/f2py-dbg
 usr/bin/f2py2.?-dbg
-usr/lib/python*/*-packages/*/*/*_d.so
+usr/lib/python2*/*-packages/*/*/*_d.so

=== modified file 'debian/python-numpy.install'
--- debian/python-numpy.install	2012-02-11 12:55:21 +0000
+++ debian/python-numpy.install	2012-03-19 18:48:19 +0000
@@ -2,23 +2,23 @@
 usr/bin/f2py2.?
 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 file 'debian/python3-numpy-dbg.install'
--- debian/python3-numpy-dbg.install	1970-01-01 00:00:00 +0000
+++ debian/python3-numpy-dbg.install	2012-03-19 18:48:19 +0000
@@ -0,0 +1,2 @@
+usr/bin/f2py3.?-dbg
+usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so

=== added file 'debian/python3-numpy.install'
--- debian/python3-numpy.install	1970-01-01 00:00:00 +0000
+++ debian/python3-numpy.install	2012-03-19 18:48:19 +0000
@@ -0,0 +1,21 @@
+usr/bin/f2py3.?
+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 file 'debian/rules' (properties changed: +x to -x)
--- debian/rules	2012-02-11 12:55:21 +0000
+++ debian/rules	2012-03-19 18:48:19 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-PYVERS=$(shell pyversions -vr debian/control)
+PY2VERS=$(shell pyversions -vr debian/control)
+PY3VERS=$(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,26 +11,36 @@
 export ATLAS=None
 
 %:
-	dh $@ --with sphinxdoc,python2
+	dh $@ --with sphinxdoc,python2,python3
+
+override_dh_auto_build:
+	dh_auto_build
+	for v in $(PY3VERS); 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`
 	rm -rf `find . -name "*.pyc" -type f`
-	rm -rf debian/tmp2
 
 override_dh_installman:
 	dh_installman numpy/f2py/f2py.1
 	# link manpage for versioned and dbg incarnations of f2py
-	for v in $(PYVERS); do \
+	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; \
+	done
 	dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py-dbg.1.gz;
 
 override_dh_install:
 	# add shebang information to f2py script
-	for v in $(PYVERS); do \
+	for v in $(PY2VERS) $(PY3VERS); do \
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v," debian/tmp/usr/bin/f2py$$v; \
 		cp -a debian/tmp/usr/bin/f2py$$v debian/tmp/usr/bin/f2py$$v-dbg ; \
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v-dbg," debian/tmp/usr/bin/f2py$$v-dbg; \
@@ -40,27 +51,39 @@
 	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
 
-
 	dh_install
 
 	# remove files installed from .install (that's due to the dir listed there)
 	find $(CURDIR)/debian/python-numpy/ -name "*_d.so" -delete
 
 	# create symlinks for .h files
-	for i in $(PYVERS); do \
+	for i in $(PY2VERS); do \
 	[ -d $(CURDIR)/debian/python-numpy/usr/include/python$$i ] || \
 		mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$$i; \
 		dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \
 	done
-	for i in $(PYVERS); do \
+	for i in $(PY2VERS); do \
 	[ -d $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d ] || \
 		mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d; \
 		dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
 	done
+	# Python 3
+	for i in $(PY3VERS); do \
+	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$$i ] || \
+		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$$i; \
+		dh_link -ppython3-numpy usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \
+	done
+	for i in $(PY3VERS); do \
+	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}_d ] || \
+		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}_d; \
+		dh_link -ppython3-numpy usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
+	done
 
 	# share -dbg and normal package doc dirs
 	rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg
-	dh_link usr/share/doc/python-numpy usr/share/doc/python-numpy-dbg
+	dh_link -ppython-numpy-dbg usr/share/doc/python-numpy usr/share/doc/python-numpy-dbg
+	rm -rf debian/python3-numpy-dbg/usr/share/doc/python3-numpy-dbg
+	dh_link -ppython3-numpy-dbg usr/share/doc/python3-numpy usr/share/doc/python3-numpy-dbg
 
 override_dh_gencontrol:
 	python debian/versions.helper >> debian/python-numpy.substvars
@@ -72,6 +95,11 @@
 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
 endif
 
 
@@ -105,13 +133,25 @@
 
 override_dh_auto_install:
 	dh_auto_install
+	
+	# Install for Python 3
+	for v in $(PY3VERS); 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
 	# select the code in the installation path
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	-for v in $(PYVERS) ; do \
+	-for v in $(PY2VERS) ; do \
 		python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \
 		python$$v-dbg -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \
 	done
+	# Python 3.2 maps to python3/ dir alone? bah
+	-for v in $(PY3VERS) ; do \
+		python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test()" ; \
+		python$$v-dbg -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test()" ; \
+	done
 endif