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

[morph at users.alioth.debian.org]

    Date: Sunday, May 6, 2012 @ 17:26:29
  Author: morph
Revision: 21624

* debian/patches/{30_fix_unicode_mgmt_py27-32.patch,
                  50_search-multiarch-paths.patch}
  - removed, merged upstream

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series
Deleted:
  packages/numpy/trunk/debian/patches/30_fix_unicode_mgmt_py27-32.patch
  packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2012-05-06 17:25:14 UTC (rev 21623)
+++ packages/numpy/trunk/debian/changelog	2012-05-06 17:26:29 UTC (rev 21624)
@@ -5,8 +5,11 @@
     thanks to Julian Taylor for the report; Closes: #665998
   * debian/watch
     - recognize RC releases
+  * debian/patches/{30_fix_unicode_mgmt_py27-32.patch,
+                    50_search-multiarch-paths.patch}
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sun, 06 May 2012 18:25:13 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 06 May 2012 19:23:36 +0200
 
 python-numpy (1:1.6.1-8) unstable; urgency=low
 

Deleted: packages/numpy/trunk/debian/patches/30_fix_unicode_mgmt_py27-32.patch
===================================================================
--- packages/numpy/trunk/debian/patches/30_fix_unicode_mgmt_py27-32.patch	2012-05-06 17:25:14 UTC (rev 21623)
+++ packages/numpy/trunk/debian/patches/30_fix_unicode_mgmt_py27-32.patch	2012-05-06 17:26:29 UTC (rev 21624)
@@ -1,49 +0,0 @@
-Description: Fix Unicode object management with Python 2.7 and 3.2
-Author: Joseph Miessner
-Forwarded: not needed
-Origin: http://projects.scipy.org/numpy/ticket/1578#comment:17
-Index: python-numpy-1.6.1/numpy/core/src/multiarray/scalarapi.c
-===================================================================
---- python-numpy-1.6.1.orig/numpy/core/src/multiarray/scalarapi.c	2011-07-20 20:25:28.000000000 +0200
-+++ python-numpy-1.6.1/numpy/core/src/multiarray/scalarapi.c	2012-04-10 22:31:45.095578334 +0200
-@@ -698,7 +698,11 @@
- #endif
-             /* Need an extra slot and need to use Python memory manager */
-             uni->str = NULL;
-+#if PY_VERSION_HEX >= 0x02070000
-+            destptr = PyObject_MALLOC(sizeof(Py_UNICODE)*(length+1));
-+#else
-             destptr = PyMem_NEW(Py_UNICODE,length+1);
-+#endif
-             if (destptr == NULL) {
-                 Py_DECREF(obj);
-                 return PyErr_NoMemory();
-Index: python-numpy-1.6.1/numpy/core/src/multiarray/ucsnarrow.c
-===================================================================
---- python-numpy-1.6.1.orig/numpy/core/src/multiarray/ucsnarrow.c	2011-07-20 20:25:28.000000000 +0200
-+++ python-numpy-1.6.1/numpy/core/src/multiarray/ucsnarrow.c	2012-04-10 22:34:00.791937442 +0200
-@@ -91,7 +91,11 @@
-     PyUnicodeObject *unicode;
-     unicode = PyObject_New(PyUnicodeObject, &PyUnicode_Type);
-     if (unicode == NULL) return NULL;
-+#if PY_VERSION_HEX >= 0x02070000
-+    unicode->str = PyObject_MALLOC(sizeof(Py_UNICODE)*(size_t)(length+1));
-+#else
-     unicode->str = PyMem_NEW(Py_UNICODE, length+1);
-+#endif
-     if (!unicode->str) {
-         _Py_ForgetReference((PyObject *)unicode);
-         PyObject_Del(unicode);
-@@ -114,7 +118,12 @@
-     void *oldstr;
- 
-     oldstr = uni->str;
-+#if PY_VERSION_HEX >= 0x02070000
-+    uni->str = PyObject_REALLOC(uni->str,
-+                                sizeof(Py_UNICODE)*(size_t)(length+1));
-+#else
-     PyMem_RESIZE(uni->str, Py_UNICODE, length+1);
-+#endif
-     if (!uni->str) {
-         uni->str = oldstr;
-         PyErr_NoMemory();

Deleted: packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
===================================================================
--- packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2012-05-06 17:25:14 UTC (rev 21623)
+++ packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2012-05-06 17:26:29 UTC (rev 21624)
@@ -1,24 +0,0 @@
-Description: search multiarch paths for libraries
- hack to get numpys distutils multiarch aware
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-numpy/+bug/818867
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640940
-Author: Julian Taylor <jtaylor at ubuntu.com>
-
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -201,6 +201,15 @@
-                                      '/usr/lib'], platform_bits)
-     default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
-                                 '/usr/include']
-+    try:
-+       import subprocess as sp
-+       p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE)
-+       triplet = str(p.communicate()[0].decode().strip())
-+       if p.returncode == 0:
-+           default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
-+           default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
-+    except:
-+       warnings.warn('failed to detect multiarch paths, please install gcc')
- 
- if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
-     default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib'))

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2012-05-06 17:25:14 UTC (rev 21623)
+++ packages/numpy/trunk/debian/patches/series	2012-05-06 17:26:29 UTC (rev 21624)
@@ -4,6 +4,4 @@
 #05_fix_endianness_detection.patch
 10_use_local_python.org_object.inv_sphinx.diff
 20_sphinx_1.1.2.diff
-30_fix_unicode_mgmt_py27-32.patch
 40_m68k_long_double_format.diff
-50_search-multiarch-paths.patch