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

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

    Date: Saturday, January 11, 2014 @ 18:32:09
  Author: jtaylor-guest
Revision: 27170

50_search-multiarch-paths.patch: drop, applied upstream

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2014-01-11 18:32:06 UTC (rev 27169)
+++ packages/numpy/trunk/debian/changelog	2014-01-11 18:32:09 UTC (rev 27170)
@@ -3,6 +3,7 @@
   * add autopkgtests running testsuite with different BLAS and testing f2py
     and distutils (Closes: #695881)
   * use dh_python2 instead of deprecated pysupport
+  * 50_search-multiarch-paths.patch: drop, applied upstream
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 11 Jan 2014 18:39:03 +0100
 

Deleted: packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
===================================================================
--- packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2014-01-11 18:32:06 UTC (rev 27169)
+++ packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2014-01-11 18:32:09 UTC (rev 27170)
@@ -1,26 +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>
-Forwarded: no (it's a Debian specific patch, for now)
-
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -208,6 +208,16 @@ else:
-     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.exists('/usr/lib/X11'):
-         globbed_x11_dir = glob('/usr/lib/*/libX11.so')
-         if globbed_x11_dir:

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2014-01-11 18:32:06 UTC (rev 27169)
+++ packages/numpy/trunk/debian/patches/series	2014-01-11 18:32:09 UTC (rev 27170)
@@ -3,4 +3,3 @@
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
 10_use_local_python.org_object.inv_sphinx.diff
-50_search-multiarch-paths.patch