[Python-modules-commits] r9154 - in packages/numpy/trunk/debian (7 files)

akumar at users.alioth.debian.org akumar at users.alioth.debian.org
Sat Jul 25 13:59:48 UTC 2009 

    Date: Saturday, July 25, 2009 @ 13:59:44
  Author: akumar
Revision: 9154

* New upstream release.
  + Fix memory leak in exponentiation. (Closes: #505999)
* debian/rules:
  + Use quilt instead of simple-patchsys.
  + Add sed magic to fix the f2py2.4 and f2py2.5
    to use the right interpreters.
  + debian/patches:
    - 01_fix_man_hyphens.patch: Removed; merged upstream.
    - 03_force_f2py_version.patch: Add to force generation
      f2py postfixed with interpreter version.
    - 04_fix_utils_deprecated.patch: Fix incorrect comma
      in utils.py. Patch from Yaroslav Halchenko (Closes: #519580)
* debian/control:
  + Standards version is now 3.8.2 (no changes needed).
  + Remove myself from uploaders.
* Non-maintainer upload.
* Fix FTBFS caused by ?\226?\128?\156/usr/bin/f2py?\226?\128?\157 no longer being available, leading
  to an impossible rename (Closes: #521525).

Added:
  packages/numpy/trunk/debian/patches/03_force_f2py_version.patch
  packages/numpy/trunk/debian/patches/04_fix_utils_deprecated.patch
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/patches/series
  packages/numpy/trunk/debian/rules
Deleted:
  packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2009-07-24 21:16:58 UTC (rev 9153)
+++ packages/numpy/trunk/debian/changelog	2009-07-25 13:59:44 UTC (rev 9154)
@@ -1,3 +1,31 @@
+python-numpy (1:1.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fix memory leak in exponentiation. (Closes: #505999)
+  * debian/rules:
+    + Use quilt instead of simple-patchsys.
+    + Add sed magic to fix the f2py2.4 and f2py2.5
+      to use the right interpreters.
+    + debian/patches:
+      - 01_fix_man_hyphens.patch: Removed; merged upstream.
+      - 03_force_f2py_version.patch: Add to force generation
+        f2py postfixed with interpreter version.
+      - 04_fix_utils_deprecated.patch: Fix incorrect comma
+        in utils.py. Patch from Yaroslav Halchenko (Closes: #519580)
+  * debian/control:
+    + Standards version is now 3.8.2 (no changes needed).
+    + Remove myself from uploaders.
+
+ -- Kumar Appaiah <akumar at debian.org>  Fri, 24 Jul 2009 13:34:52 -0500
+
+python-numpy (1:1.2.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS caused by “/usr/bin/f2py” no longer being available, leading
+    to an impossible rename (Closes: #521525).
+
+ -- Cyril Brulebois <kibi at debian.org>  Fri, 03 Jul 2009 11:13:31 +0200
+
 python-numpy (1:1.2.1-1) unstable; urgency=low
 
   [ David Cournapeau ]

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2009-07-24 21:16:58 UTC (rev 9153)
+++ packages/numpy/trunk/debian/control	2009-07-25 13:59:44 UTC (rev 9154)
@@ -2,10 +2,10 @@
 Section: python
 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>, David Cournapeau <cournape at gmail.com>
+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>, David Cournapeau <cournape at gmail.com>
 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, quilt
 XS-Python-Version: >= 2.4
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/numpy/trunk/
 XS-DM-Upload-Allowed: yes

Deleted: packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch
===================================================================
--- packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch	2009-07-24 21:16:58 UTC (rev 9153)
+++ packages/numpy/trunk/debian/patches/01_fix_man_hyphens.patch	2009-07-25 13:59:44 UTC (rev 9154)
@@ -1,84 +0,0 @@
-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/03_force_f2py_version.patch
===================================================================
--- packages/numpy/trunk/debian/patches/03_force_f2py_version.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/03_force_f2py_version.patch	2009-07-25 13:59:44 UTC (rev 9154)
@@ -0,0 +1,13 @@
+Index: python-numpy-1.3.0/numpy/f2py/setup.py
+===================================================================
+--- python-numpy-1.3.0.orig/numpy/f2py/setup.py	2009-07-25 08:42:47.000000000 -0500
++++ python-numpy-1.3.0/numpy/f2py/setup.py	2009-07-25 08:52:40.000000000 -0500
+@@ -40,7 +40,7 @@
+     config.make_svn_version_py()
+ 
+     def generate_f2py_py(build_dir):
+-        f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
++        f2py_exe = 'f2py'+sys.version[:3]
+         if f2py_exe[-4:]=='.exe':
+             f2py_exe = f2py_exe[:-4] + '.py'
+         if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':

Added: packages/numpy/trunk/debian/patches/04_fix_utils_deprecated.patch
===================================================================
--- packages/numpy/trunk/debian/patches/04_fix_utils_deprecated.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/04_fix_utils_deprecated.patch	2009-07-25 13:59:44 UTC (rev 9154)
@@ -0,0 +1,13 @@
+Index: python-numpy-1.3.0/numpy/lib/utils.py
+===================================================================
+--- python-numpy-1.3.0.orig/numpy/lib/utils.py	2009-07-25 08:53:06.000000000 -0500
++++ python-numpy-1.3.0/numpy/lib/utils.py	2009-07-25 08:53:26.000000000 -0500
+@@ -100,7 +100,7 @@
+         str1 = "%s is deprecated" % (oldname,)
+         depdoc = "%s is DEPRECATED!!" % (oldname,)
+     else:
+-        str1 = "%s is deprecated, use %s" % (oldname, newname),
++        str1 = "%s is deprecated, use %s" % (oldname, newname)
+         depdoc = '%s is DEPRECATED!! -- use %s instead' % (oldname, newname,)
+ 
+     def newfunc(*args,**kwds):

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2009-07-24 21:16:58 UTC (rev 9153)
+++ packages/numpy/trunk/debian/patches/series	2009-07-25 13:59:44 UTC (rev 9154)
@@ -1,2 +1,5 @@
-01_fix_man_hyphens.patch
+#01_fix_man_hyphens.patch
 02_build_dotblas.patch
+03_force_f2py_version.patch
+04_fix_utils_deprecated.patch
+

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2009-07-24 21:16:58 UTC (rev 9153)
+++ packages/numpy/trunk/debian/rules	2009-07-25 13:59:44 UTC (rev 9154)
@@ -22,7 +22,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 clean::
 	-rm -rf `find -name build -type d`
@@ -41,14 +41,14 @@
 	for v in $(PYVERS); do \
 	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v.1; \
 	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v-dbg.1; \
+	  sed -i "1s/python[^ ]*/python$$v/" debian/tmp/usr/bin/f2py$$v; \
 	done
 
 	: # Add unversioned numpy script
-	mv $(DEB_DESTDIR)/usr/bin/f2py $(DEB_DESTDIR)/usr/bin/f2py$(cdbs_python_current_version)
 	ln -s f2py$(cdbs_python_current_version) debian/python-numpy/usr/bin/f2py
 
 	: # Make Python scripts executable
-	for i in `find debian/tmp -type f`; do \
+	for i in `find debian/tmp/usr/lib -type f`; do \
 	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
 		$$i > $$i.temp; \
 	  if cmp --quiet $$i $$i.temp; then \
@@ -59,6 +59,7 @@
 	    echo "fixed interpreter: $$i"; \
 	  fi; \
 	done
+
 	for i in $(cdbs_python_build_versions); do \
 	[ -d $(CURDIR)/debian/python-numpy/usr/include/python$$i ] || \
 		mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$$i; \

More information about the Python-modules-commits mailing list