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

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

    Date: Sunday, July 6, 2008 @ 16:30:43
  Author: certik-guest
Revision: 5837

preparing for an upload

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/patches/series
Deleted:
  packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2008-07-04 15:14:37 UTC (rev 5836)
+++ packages/numpy/trunk/debian/changelog	2008-07-06 16:30:43 UTC (rev 5837)
@@ -1,4 +1,4 @@
-python-numpy (1:1.1.0-2) UNRELEASED; urgency=low
+python-numpy (1:1.1.0-2) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * debian/rules:
@@ -7,8 +7,11 @@
     - Update python-numpy-doc's long description to mention that it also
       contains Numpy documentation.
 
- -- Ondrej Certik <ondrej at certik.cz>  Sun, 15 Jun 2008 14:16:58 +0200
+  [ Tiziano Zito ]
+  * debian/control, debian/patches/: enable ATLAS support (Closes: #489253)
 
+ -- Ondrej Certik <ondrej at certik.cz>  Sun, 06 Jul 2008 18:28:29 +0200
+
 python-numpy (1:1.1.0-1) unstable; urgency=low
 
   [ Ondrej Certik ]

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2008-07-04 15:14:37 UTC (rev 5836)
+++ packages/numpy/trunk/debian/control	2008-07-06 16:30:43 UTC (rev 5837)
@@ -3,7 +3,7 @@
 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], debhelper (>= 5.0.38), patchutils, python-docutils, libfftw3-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], libatlas-base-dev [!arm !m68k] | libatlas-sse-dev [!arm !m68k] | libatlas-sse2-dev [!arm !m68k] | libatlas-3dnow-dev [!arm !m68k], debhelper (>= 5.0.38), patchutils, python-docutils, libfftw3-dev
 Build-Conflicts: atlas3-base-dev
 XS-Python-Version: >= 2.3
 Standards-Version: 3.8.0

Deleted: packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff
===================================================================
--- packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff	2008-07-04 15:14:37 UTC (rev 5836)
+++ packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff	2008-07-06 16:30:43 UTC (rev 5837)
@@ -1,61 +0,0 @@
-Patch to prevent Atlas from being detected during the build, as we
-want to depend on the reference BLAS and LAPACK even when Atlas is
-around.
-
-Kumar Appaiah <akumar at ee.iitm.ac.in>
-Index: b/numpy/distutils/system_info.py
-===================================================================
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -879,21 +879,21 @@
-         atlas = None
-         lapack = None
-         atlas_1 = None
--        for d in lib_dirs:
--            atlas = self.check_libs2(d,atlas_libs,[])
--            lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
--            if atlas is not None:
--                lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
--                for d2 in lib_dirs2:
--                    lapack = self.check_libs2(d2,lapack_libs,[])
--                    if lapack is not None:
--                        break
--                else:
--                    lapack = None
--                if lapack is not None:
--                    break
--            if atlas:
--                atlas_1 = atlas
-+#         for d in lib_dirs:
-+#             atlas = self.check_libs2(d,atlas_libs,[])
-+#             lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
-+#             if atlas is not None:
-+#                 lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
-+#                 for d2 in lib_dirs2:
-+#                     lapack = self.check_libs2(d2,lapack_libs,[])
-+#                     if lapack is not None:
-+#                         break
-+#                 else:
-+#                     lapack = None
-+#                 if lapack is not None:
-+#                     break
-+#             if atlas:
-+#                 atlas_1 = atlas
-         log.info(self.__class__)
-         if atlas is None:
-             atlas = atlas_1
-@@ -967,10 +967,10 @@
-         atlas_libs = self.get_libs('atlas_libs',
-                                    self._lib_names + self._lib_atlas)
-         atlas = None
--        for d in lib_dirs:
--            atlas = self.check_libs2(d,atlas_libs,[])
--            if atlas is not None:
--                break
-+#         for d in lib_dirs:
-+#             atlas = self.check_libs2(d,atlas_libs,[])
-+#             if atlas is not None:
-+#                 break
-         if atlas is None:
-             return
-         include_dirs = self.get_include_dirs()

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2008-07-04 15:14:37 UTC (rev 5836)
+++ packages/numpy/trunk/debian/patches/series	2008-07-06 16:30:43 UTC (rev 5837)
@@ -1,2 +1 @@
 01_fix_man_hyphens.patch
-02_dontuse_lapack.diff