diff -Nru python-numpy-1.6.2/debian/changelog python-numpy-1.6.2/debian/changelog --- python-numpy-1.6.2/debian/changelog 2012-05-30 19:38:42.000000000 +0200 +++ python-numpy-1.6.2/debian/changelog 2012-06-02 18:44:17.000000000 +0200 @@ -1,3 +1,17 @@ +python-numpy (1:1.6.2-1ubuntu1) quantal; urgency=low + + * remove unused patch debian-changes-1:1.5.1-2ubuntu2 + * Merge from Debian unstable. 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 + + -- Julian Taylor Sat, 02 Jun 2012 18:44:16 +0200 + python-numpy (1:1.6.2-1) unstable; urgency=low * New upstream release @@ -63,6 +77,24 @@ -- Sandro Tosi Wed, 11 Apr 2012 00:42:00 +0200 +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 Mon, 19 Mar 2012 19:38:13 +0100 + python-numpy (1:1.6.1-6) experimental; urgency=low [ Thomas Kluyver ] @@ -76,6 +108,30 @@ -- Sandro Tosi 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) + use gcc -print-multiarch to detect the path and recommend gcc + + -- Julian Taylor Mon, 19 Mar 2012 07:50:30 +0100 + +python-numpy (1:1.6.1-5ubuntu1) precise; urgency=low + + * debian/patches/search-multiarch-paths.patch: (LP: #818867) + - add multiarch libdirs to numpy.distutils.system_info + * Merge from Debian unstable, 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 + + -- Julian Taylor Sat, 11 Feb 2012 12:55:21 +0100 + python-numpy (1:1.6.1-5) experimental; urgency=low * debian/versions @@ -164,6 +220,29 @@ -- Sandro Tosi Tue, 04 Oct 2011 11:43:55 +0200 +python-numpy (1:1.5.1-2ubuntu3) precise; urgency=low + + * Build using dh_python2 + + -- Matthias Klose Sat, 17 Dec 2011 17:22:00 +0000 + +python-numpy (1:1.5.1-2ubuntu2) oneiric; urgency=low + + * numpy/distutils/fcompiler/gnu.py: add 'shared' to linker_so. LP: #829488. + + -- Matthias Klose Thu, 25 Aug 2011 23:56:45 +0200 + +python-numpy (1:1.5.1-2ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable, 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. + + -- Barry Warsaw Wed, 25 May 2011 15:52:10 -0400 + python-numpy (1:1.5.1-2) unstable; urgency=low * debian/rules @@ -172,6 +251,29 @@ -- Sandro Tosi Mon, 04 Apr 2011 15:27:09 +0200 +python-numpy (1:1.5.1-1ubuntu2) natty; urgency=low + + * debian/rules, debian/control: + - Re-enable documentation binary package. (LP: #664276) + * debian/control: + - Add python-sphinx to Build-Depends since it is required to build the + documentation. + * 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. + + -- Barry Warsaw Thu, 10 Feb 2011 15:12:43 -0500 + +python-numpy (1:1.5.1-1ubuntu1) natty; urgency=low + + * Merge from debian experimental (LP: #695005). Remaining changes: + - Drop build-depends on python-sphinx and python-matplotlib + - Comment python-numpy-doc out of debian/control + - Comment out doc specific elements of debian/rules + + -- Sameer Morar Tue, 25 Jan 2011 15:33:25 +0100 + python-numpy (1:1.5.1-1) experimental; urgency=low * New upstream release @@ -187,6 +289,38 @@ -- Sandro Tosi Fri, 24 Dec 2010 00:14:25 +0100 +python-numpy (1:1.4.1-5ubuntu4) natty; urgency=low + + * Fix pymvpa crash caused by numpy incompatibility with Python 2.7. + This is a back port of the numpy upstream changeset: + http://projects.scipy.org/numpy/changeset/8394 + (LP: #685469) + + -- Barry Warsaw Thu, 16 Dec 2010 15:57:29 -0500 + +python-numpy (1:1.4.1-5ubuntu3) natty; urgency=low + + * Rebuild with python2.7 as the default python version. + + -- Matthias Klose Sat, 11 Dec 2010 01:02:18 +0100 + +python-numpy (1:1.4.1-5ubuntu2) natty; urgency=low + + * No change rebuild to pick up python2.7 support + + -- Scott Kitterman Fri, 05 Nov 2010 09:45:06 -0400 + +python-numpy (1:1.4.1-5ubuntu1) natty; urgency=low + + * Heartlessly rip docs package out of numpy until it's sorted out how to + deal with main/universe split (this is temporary - don't panic, barry will + fix this) + - Drop build-depends on python-sphinx and python-matplotlib + - Comment python-numpy-doc out of debian/control + - Comment out doc specific elements of debian/rules + + -- Scott Kitterman Wed, 20 Oct 2010 23:15:34 -0400 + python-numpy (1:1.4.1-5) unstable; urgency=low * debian/patches/10_use_local_python.org_object.inv_sphinx.diff diff -Nru python-numpy-1.6.2/debian/control python-numpy-1.6.2/debian/control --- python-numpy-1.6.2/debian/control 2012-04-19 23:27:11.000000000 +0200 +++ python-numpy-1.6.2/debian/control 2012-06-02 18:40:44.000000000 +0200 @@ -1,9 +1,10 @@ Source: python-numpy Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Sandro Tosi -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, python-sphinx (>= 1.0.7+dfsg), python-nose, python3-all-dev, python3-all-dbg, python3-nose, python-matplotlib +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 diff -Nru python-numpy-1.6.2/debian/patches/20_disable-plot-extension.patch python-numpy-1.6.2/debian/patches/20_disable-plot-extension.patch --- python-numpy-1.6.2/debian/patches/20_disable-plot-extension.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-numpy-1.6.2/debian/patches/20_disable-plot-extension.patch 2012-06-02 18:40:44.000000000 +0200 @@ -0,0 +1,81 @@ +Description: Disable plot_directive and ignore any import errors when + importing matplotlib. python-matplotlib is in universe and cannot be used + as a dependency. +Author: Barry Warsaw +Bug-Ubuntu: https://launchpad.net/bugs/664276 +=== modified file 'doc/source/conf.py' +--- old/doc/source/conf.py 2010-12-24 00:14:25 +0000 ++++ new/doc/source/conf.py 2011-02-10 17:23:52 +0000 +@@ -21,7 +21,8 @@ + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath', 'numpydoc', + 'sphinx.ext.intersphinx', 'sphinx.ext.coverage', + 'sphinx.ext.doctest', 'sphinx.ext.autosummary', +- 'plot_directive'] ++ #'plot_directive'] ++ ] + + # Add any paths that contain templates here, relative to this directory. + templates_path = ['_templates'] +@@ -212,7 +213,7 @@ + phantom_import_file = 'dump.xml' + + # Make numpydoc to generate plots for example sections +-numpydoc_use_plots = True ++numpydoc_use_plots = False + + # ----------------------------------------------------------------------------- + # Autosummary +@@ -251,19 +252,23 @@ + import math + phi = (math.sqrt(5) + 1)/2 + +-import matplotlib +-matplotlib.rcParams.update({ +- 'font.size': 8, +- 'axes.titlesize': 8, +- 'axes.labelsize': 8, +- 'xtick.labelsize': 8, +- 'ytick.labelsize': 8, +- 'legend.fontsize': 8, +- 'figure.figsize': (3*phi, 3), +- 'figure.subplot.bottom': 0.2, +- 'figure.subplot.left': 0.2, +- 'figure.subplot.right': 0.9, +- 'figure.subplot.top': 0.85, +- 'figure.subplot.wspace': 0.4, +- 'text.usetex': False, +-}) ++try: ++ import matplotlib ++except ImportError: ++ sys.stderr.write('matplotlib is not available; disabling plots\n') ++else: ++ matplotlib.rcParams.update({ ++ 'font.size': 8, ++ 'axes.titlesize': 8, ++ 'axes.labelsize': 8, ++ 'xtick.labelsize': 8, ++ 'ytick.labelsize': 8, ++ 'legend.fontsize': 8, ++ 'figure.figsize': (3*phi, 3), ++ 'figure.subplot.bottom': 0.2, ++ 'figure.subplot.left': 0.2, ++ 'figure.subplot.right': 0.9, ++ 'figure.subplot.top': 0.85, ++ 'figure.subplot.wspace': 0.4, ++ 'text.usetex': False, ++ }) + +=== modified file 'doc/sphinxext/tests/test_docscrape.py' +--- old/doc/sphinxext/tests/test_docscrape.py 2010-12-24 00:14:25 +0000 ++++ new/doc/sphinxext/tests/test_docscrape.py 2011-02-10 17:23:52 +0000 +@@ -559,7 +559,7 @@ + assert doc['Summary'][0] == u'öäöäöäöäöåååå'.encode('utf-8') + + def test_plot_examples(): +- cfg = dict(use_plots=True) ++ cfg = dict(use_plots=False) + + doc = SphinxDocString(""" + Examples + diff -Nru python-numpy-1.6.2/debian/patches/series python-numpy-1.6.2/debian/patches/series --- python-numpy-1.6.2/debian/patches/series 2012-05-23 22:29:31.000000000 +0200 +++ python-numpy-1.6.2/debian/patches/series 2012-06-02 18:40:44.000000000 +0200 @@ -5,4 +5,5 @@ 10_use_local_python.org_object.inv_sphinx.diff 20_sphinx_1.1.2.diff 40_m68k_long_double_format.diff -50_search-multiarch-paths.patch +20_disable-plot-extension.patch +50_search-multiarch-paths.patch \ No newline at end of file diff -Nru python-numpy-1.6.2/debian/python3-numpy-dbg.install python-numpy-1.6.2/debian/python3-numpy-dbg.install --- python-numpy-1.6.2/debian/python3-numpy-dbg.install 2012-03-16 23:22:11.000000000 +0100 +++ python-numpy-1.6.2/debian/python3-numpy-dbg.install 2012-06-02 18:40:44.000000000 +0200 @@ -1 +1,2 @@ +usr/bin/f2py3.?-dbg usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so diff -Nru python-numpy-1.6.2/debian/python3-numpy.install python-numpy-1.6.2/debian/python3-numpy.install --- python-numpy-1.6.2/debian/python3-numpy.install 2012-04-19 23:27:11.000000000 +0200 +++ python-numpy-1.6.2/debian/python3-numpy.install 2012-06-02 18:40:44.000000000 +0200 @@ -1,4 +1,5 @@ debian/dh_numpy3 usr/bin +usr/bin/f2py3.? usr/lib/python3*/*-packages/*/*/*.cpython-3?[!d]*.so usr/lib/python3*/*-packages/*/*/*/libnpymath.a usr/lib/python3*/*-packages/*/*.py diff -Nru python-numpy-1.6.2/debian/python-numpy-dbg.install python-numpy-1.6.2/debian/python-numpy-dbg.install --- python-numpy-1.6.2/debian/python-numpy-dbg.install 2012-03-16 23:22:11.000000000 +0100 +++ python-numpy-1.6.2/debian/python-numpy-dbg.install 2012-06-02 18:40:44.000000000 +0200 @@ -1 +1,3 @@ +usr/bin/f2py-dbg +usr/bin/f2py2.?-dbg usr/lib/python2*/*-packages/*/*/*_d.so diff -Nru python-numpy-1.6.2/debian/python-numpy.install python-numpy-1.6.2/debian/python-numpy.install --- python-numpy-1.6.2/debian/python-numpy.install 2012-04-18 19:44:55.000000000 +0200 +++ python-numpy-1.6.2/debian/python-numpy.install 2012-06-02 18:40:44.000000000 +0200 @@ -1,3 +1,5 @@ +usr/bin/f2py +usr/bin/f2py2.? debian/dh_numpy usr/bin debian/versions usr/share/numpy/ usr/lib/python2*/*-packages/*/*/*[!_][!_].so diff -Nru python-numpy-1.6.2/debian/rules python-numpy-1.6.2/debian/rules --- python-numpy-1.6.2/debian/rules 2012-05-23 23:26:45.000000000 +0200 +++ python-numpy-1.6.2/debian/rules 2012-06-02 18:44:12.000000000 +0200 @@ -11,7 +11,7 @@ export ATLAS=None %: - dh $@ --with sphinxdoc,python3 + dh $@ --with sphinxdoc,python2,python3 override_dh_auto_build: dh_auto_build @@ -24,7 +24,6 @@ dh_auto_clean rm -rf `find -name build -type d` rm -rf `find . -name "*.pyc" -type f` - rm -rf debian/tmp2 rm -rf doc/fontList.cache numpy/f2py/docs/usersguide/index.html override_dh_installman: @@ -53,11 +52,6 @@ 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 - mkdir debian/tmp2 - mv debian/tmp/usr/bin/* debian/tmp2 - dh_install # remove files installed from .install (that's due to the dir listed there) @@ -67,12 +61,12 @@ 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/pymodules/python$$i/numpy/core/include/numpy usr/include/python$$i/numpy; \ + dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \ done 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/pymodules/python$$i/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \ + 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 \ @@ -105,37 +99,22 @@ 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 + -rm debian/python3-numpy/usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so # fix python-debug-in-wrong-location lintian warning - cd debian/python-numpy-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules endif -override_dh_pysupport: - dh_pysupport - - # copy back f2py* bin, in their ultimate location - mv debian/tmp2/f2py2.? debian/tmp2/f2py debian/python-numpy/usr/bin/ - mkdir -p 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 - # the file and then add it to the public list - for file in ./debian/tmp/usr/lib/python2.*/*-packages/numpy/core/lib/libnpymath.a ; do \ - newfile=$$(echo $$file | sed 's|tmp|python-numpy|' | sed "s|lib/python|lib/pyshared/python|" | sed 's|[^/]*-packages/||') ;\ - mkdir -p $$(dirname $$newfile) ;\ - cp -a $$file $$newfile ;\ - installedfile=$$(echo $$newfile | sed 's|./debian/python-numpy||') ;\ - # add to public modules list ;\ - echo $$installedfile >> ./debian/python-numpy/usr/share/python-support/python-numpy.public ;\ - done +override_dh_python2: + -ls -l debian/python-numpy/usr/share/pyshared/numpy/core/lib/libnpymath.a + dh_python2 -v -X libnpymath.a + -ls -l debian/python-numpy/usr/share/pyshared/numpy/core/lib/libnpymath.a + -ls -l debian/python-numpy/usr/lib/python2.7/dist-packages/numpy/core/lib/libnpymath.a + if [ -h debian/python-numpy/usr/lib/python2.7/dist-packages/numpy/core/lib/libnpymath.a ]; then \ + rm -f debian/python-numpy/usr/lib/python2.7/dist-packages/numpy/core/lib/libnpymath.a; \ + mv debian/python-numpy/usr/share/pyshared/numpy/core/lib/libnpymath.a \ + debian/python-numpy/usr/lib/python2.7/dist-packages/numpy/core/lib/libnpymath.a; \ + fi override_dh_sphinxdoc: dh_sphinxdoc -i @@ -143,7 +122,7 @@ build: build-arch build-indep ; build-arch: - dh build + dh build --with=python2,python3 build-indep: