[Python-modules-commits] r5897 - in packages/numpy/trunk/debian (4 files)

[certik-guest at users.alioth.debian.org]

    Date: Tuesday, July 8, 2008 @ 12:40:15
  Author: certik-guest
Revision: 5897

Applying Tiziano's patch.

Added:
  packages/numpy/trunk/debian/patches/02_build_dotblas.patch
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2008-07-08 11:09:04 UTC (rev 5896)
+++ packages/numpy/trunk/debian/changelog	2008-07-08 12:40:15 UTC (rev 5897)
@@ -1,4 +1,4 @@
-python-numpy (1:1.1.0-4) UNRELEASED; urgency=low
+python-numpy (1:1.1.0-4) unstable; urgency=low
 
   [ Riku Voipio ]
   * debian/control: atlas is not available on armel, and after a quick look
@@ -7,11 +7,15 @@
     away, these are potentially dangerous on buildd's. Ondrej: dropped.
     (Closes: #489568)
 
+  [ Tiziano Zito ]
+  * patch: build _dotblas.c when ATLAS is not installed, build-conflict with
+    atlas, build-depend on blas+lapack only, as it used to be
+
   [ Carlos Galisteo ]
   * debian/control
     - Added Homepage field.
 
- -- Carlos Galisteo <cgalisteo at k-rolus.net>  Mon, 07 Jul 2008 16:40:45 +0000
+ -- Ondrej Certik <ondrej at certik.cz>  Tue, 08 Jul 2008 14:39:50 +0200
 
 python-numpy (1:1.1.0-2) unstable; urgency=low
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2008-07-08 11:09:04 UTC (rev 5896)
+++ packages/numpy/trunk/debian/control	2008-07-08 12:40:15 UTC (rev 5897)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Marco Presi (Zufus) <zufus at debian.org>, Alexandre Fayolle <afayolle at debian.org>, José Fonseca <j_r_fonseca at yahoo.co.uk>, Matthias Klose <doko at debian.org>, Ondrej Certik <ondrej at certik.cz>, Kumar Appaiah <akumar at debian.org>
-Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-all-dbg, python-central (>= 0.6), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], libatlas-base-dev [!alpha !arm !armel !m68k],debhelper (>= 5.0.38), patchutils, python-docutils, libfftw3-dev
-Build-Conflicts: atlas3-base-dev
+Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-all-dbg, python-central (>= 0.6), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 5.0.38), patchutils, python-docutils, libfftw3-dev
+Build-Conflicts: atlas3-base-dev, libatlas-headers, libatlas-base-dev, libatlas-sse-dev, libatlas-sse2-dev, libatlas-3dnow-dev
 XS-Python-Version: >= 2.3
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk

Added: packages/numpy/trunk/debian/patches/02_build_dotblas.patch
===================================================================
--- packages/numpy/trunk/debian/patches/02_build_dotblas.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/02_build_dotblas.patch	2008-07-08 12:40:15 UTC (rev 5897)
@@ -0,0 +1,18 @@
+Patch to build _dotblas.c when ATLAS is not installed.
+
+Added by: Tiziano Zito <otizonaizit at yahoo.com>
+Index: python-numpy-1.1.0.new/numpy/core/setup.py
+===================================================================
+--- python-numpy-1.1.0.old/numpy/core/setup.py 2008-05-26 09:39:44.000000000 +0200
++++ python-numpy-1.1.0.new/numpy/core/setup.py 2008-07-08 13:37:23.000000000 +0200
+@@ -291,8 +291,8 @@
+     #blas_info = {}
+     def get_dotblas_sources(ext, build_dir):
+         if blas_info:
+-            if ('NO_ATLAS_INFO',1) in blas_info.get('define_macros',[]):
+-                return None # dotblas needs ATLAS, Fortran compiled blas will not be sufficient.
++            #if ('NO_ATLAS_INFO',1) in blas_info.get('define_macros',[]):
++            #    return None # dotblas needs ATLAS, Fortran compiled blas will not be sufficient.
+             return ext.depends[:1]
+         return None # no extension module will be built
+ 

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2008-07-08 11:09:04 UTC (rev 5896)
+++ packages/numpy/trunk/debian/patches/series	2008-07-08 12:40:15 UTC (rev 5897)
@@ -1 +1,2 @@
 01_fix_man_hyphens.patch
+02_build_dotblas.patch