[Python-modules-commits] r5580 - in packages/numpy/trunk/debian (4 files)
astraw-guest at users.alioth.debian.org
astraw-guest at users.alioth.debian.org
Mon Jun 9 18:36:22 UTC 2008
Date: Monday, June 9, 2008 @ 18:36:21
Author: astraw-guest
Revision: 5580
restore patches directory (accidentally deleted in r5579)
Added:
packages/numpy/trunk/debian/patches/
packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch
packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff
packages/numpy/trunk/debian/patches/series
Added: packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch
===================================================================
--- packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch (rev 0)
+++ packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch 2008-06-09 18:36:21 UTC (rev 5580)
@@ -0,0 +1,84 @@
+Patch to escape all hyphens in the f2py man page.
+
+Added by: Kumar Appaiah <akumar at ee.iitm.ac.in>
+Index: b/numpy/f2py/f2py.1
+===================================================================
+--- a/numpy/f2py/f2py.1
++++ b/numpy/f2py/f2py.1
+@@ -20,7 +20,7 @@
+ This program generates a Python C/API file (<modulename>module.c)
+ that contains wrappers for given Fortran or C functions so that they
+ can be called from Python.
+-With the -c option the corresponding
++With the \-c option the corresponding
+ extension modules are built.
+ .SH OPTIONS
+ .TP
+@@ -49,8 +49,8 @@
+ \'untitled\'.
+ .TP
+ .B \-\-[no\-]lower
+-Do [not] lower the cases in <fortran files>. By default, --lower is
+-assumed with -h key, and --no-lower without -h key.
++Do [not] lower the cases in <fortran files>. By default, \-\-lower is
++assumed with \-h key, and \-\-no\-lower without \-h key.
+ .TP
+ .B \-\-build\-dir <dirname>
+ All f2py generated files are created in <dirname>. Default is tempfile.mktemp().
+@@ -59,14 +59,14 @@
+ Overwrite existing signature file.
+ .TP
+ .B \-\-[no\-]latex\-doc
+-Create (or not) <modulename>module.tex. Default is --no-latex-doc.
++Create (or not) <modulename>module.tex. Default is \-\-no\-latex\-doc.
+ .TP
+ .B \-\-short\-latex
+ Create 'incomplete' LaTeX document (without commands \\documentclass,
+ \\tableofcontents, and \\begin{document}, \\end{document}).
+ .TP
+ .B \-\-[no\-]rest\-doc
+-Create (or not) <modulename>module.rst. Default is --no-rest-doc.
++Create (or not) <modulename>module.rst. Default is \-\-no\-rest\-doc.
+ .TP
+ .B \-\-debug\-capi
+ Create C/API code that reports the state of the wrappers during
+@@ -81,12 +81,12 @@
+ .TP
+ .B \-\-[no\-]wrap\-functions
+ Create Fortran subroutine wrappers to Fortran 77
+-functions. --wrap-functions is default because it ensures maximum
++functions. \-\-wrap\-functions is default because it ensures maximum
+ portability/compiler independence.
+ .TP
+ .B \-\-help\-link [..]
+ List system resources found by system_info.py. [..] may contain
+-a list of resources names. See also --link-<resource> switch below.
++a list of resources names. See also \-\-link\-<resource> switch below.
+ .TP
+ .B \-\-quiet
+ Run quietly.
+@@ -100,7 +100,7 @@
+ .B \-\-include_paths path1:path2:...
+ Search include files (that f2py will scan) from the given directories.
+ .SH "CONFIG_FC OPTIONS"
+-The following options are effective only when -c switch is used.
++The following options are effective only when \-c switch is used.
+ .TP
+ .B \-\-help-compiler
+ List available Fortran compilers [DEPRECIATED].
+@@ -147,13 +147,13 @@
+ .B \-\-debug
+ Compile with debugging information.
+ .SH "EXTRA OPTIONS"
+-The following options are effective only when -c switch is used.
++The following options are effective only when \-c switch is used.
+ .TP
+ .B \-\-link-<resource>
+ Link extension module with <resource> as defined by
+ numpy_distutils/system_info.py. E.g. to link with optimized LAPACK
+ libraries (vecLib on MacOSX, ATLAS elsewhere), use
+---link-lapack_opt. See also --help-link switch.
++\-\-link\-lapack_opt. See also \-\-help\-link switch.
+
+ .TP
+ .B -L/path/to/lib/ -l<libname>
Added: packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff
===================================================================
--- packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff (rev 0)
+++ packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff 2008-06-09 18:36:21 UTC (rev 5580)
@@ -0,0 +1,61 @@
+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()
Added: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series (rev 0)
+++ packages/numpy/trunk/debian/patches/series 2008-06-09 18:36:21 UTC (rev 5580)
@@ -0,0 +1,2 @@
+01_fix_man_hyphens.patch
+02_dontuse_lapack.diff
More information about the Python-modules-commits
mailing list