[Python-modules-commits] r14764 - in packages/numpy/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, October 27, 2010 @ 18:08:51
  Author: morph
Revision: 14764

removed, available in upstream tarball

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series
Deleted:
  packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2010-10-27 17:41:55 UTC (rev 14763)
+++ packages/numpy/trunk/debian/changelog	2010-10-27 18:08:51 UTC (rev 14764)
@@ -3,10 +3,10 @@
   * New (release candidate) upstream release
   * debian/control
     - python-sphinx version 1.0.1 is the minimum required
-  * debian/patches/changeset_*
+  * debian/patches/{07_bts585309_string_exceptions.diff, changeset_*}
     - removed, available in upstream tarball
 
- -- Sandro Tosi <morph at debian.org>  Wed, 27 Oct 2010 19:41:25 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 27 Oct 2010 20:07:41 +0200
 
 python-numpy (1:1.4.1-5) unstable; urgency=low
 

Deleted: packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff
===================================================================
--- packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff	2010-10-27 17:41:55 UTC (rev 14763)
+++ packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff	2010-10-27 18:08:51 UTC (rev 14764)
@@ -1,16 +0,0 @@
-Description: Remove string exceptions
-
-Index: python-numpy-1.4.1/numpy/f2py/capi_maps.py
-===================================================================
---- python-numpy-1.4.1.orig/numpy/f2py/capi_maps.py	2010-06-30 18:04:02.420160466 +0200
-+++ python-numpy-1.4.1/numpy/f2py/capi_maps.py	2010-06-30 18:04:23.320158823 +0200
-@@ -429,7 +429,8 @@
-                 else:
-                     v = eval(v,{},{})
-                     ret['init.r'],ret['init.i']=str(v.real),str(v.imag)
--            except: raise 'sign2map: expected complex number `(r,i)\' but got `%s\' as initial value of %s.'%(init,`a`)
-+            except:
-+                raise ValueError('sign2map: expected complex number `(r,i)\' but got `%s\' as initial value of %r.' % (init, a))
-             if isarray(var):
-                 init='(capi_c.r=%s,capi_c.i=%s,capi_c)'%(ret['init.r'],ret['init.i'])
-         elif isstring(var):

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2010-10-27 17:41:55 UTC (rev 14763)
+++ packages/numpy/trunk/debian/patches/series	2010-10-27 18:08:51 UTC (rev 14764)
@@ -2,9 +2,4 @@
 02_build_dotblas.patch
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
-07_bts585309_string_exceptions.diff
 10_use_local_python.org_object.inv_sphinx.diff
-changeset_r8510.diff
-changeset_r8511.diff
-changeset_r8526.diff
-changeset_r8364.diff