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

[morph at users.alioth.debian.org]

    Date: Tuesday, April 10, 2012 @ 22:37:09
  Author: morph
Revision: 21168

* debian/patches/50_search-multiarch-paths.patch, debian/control
  - add multiarch paths to those searched by Numpy distutils, adding gcc to
    Suggests (it's not needed so often); thanks to Julian Taylor for the
    report and patch (as shipped in Ubuntu); Closes: #640940

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2012-04-10 21:57:15 UTC (rev 21167)
+++ packages/numpy/trunk/debian/changelog	2012-04-10 22:37:09 UTC (rev 21168)
@@ -14,8 +14,12 @@
   * debian/patches/30_fix_unicode_mgmt_py27-32.patch
     - fix Unicode object management with Python 2.7 and 3.2; thanks to Julian
       Taylor for the report; Closes: #664672
+  * debian/patches/50_search-multiarch-paths.patch, debian/control
+    - add multiarch paths to those searched by Numpy distutils, adding gcc to
+      Suggests (it's not needed so often); thanks to Julian Taylor for the
+      report and patch (as shipped in Ubuntu); Closes: #640940
 
- -- Sandro Tosi <morph at debian.org>  Tue, 10 Apr 2012 23:54:25 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 11 Apr 2012 00:15:10 +0200
 
 python-numpy (1:1.6.1-6) experimental; urgency=low
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2012-04-10 21:57:15 UTC (rev 21167)
+++ packages/numpy/trunk/debian/control	2012-04-10 22:37:09 UTC (rev 21168)
@@ -15,7 +15,7 @@
 Package: python-numpy
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: python-numpy-doc, python-numpy-dbg, python-nose (>= 0.10.1), python-dev, gfortran
+Suggests: python-numpy-doc, python-numpy-dbg, python-nose (>= 0.10.1), python-dev, gfortran, gcc (>= 4:4.6.1-5)
 Provides: ${python:Provides}, ${numpy:Provides}, python-numpy-dev, python-f2py
 Description: Numerical Python adds a fast array facility to the Python language
  Numpy contains a powerful N-dimensional array object, sophisticated
@@ -47,7 +47,7 @@
 Package: python3-numpy
 Architecture: any
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: python-numpy-doc, python3-numpy-dbg, python3-nose (>= 0.10.1), python3-dev, gfortran
+Suggests: python-numpy-doc, python3-numpy-dbg, python3-nose (>= 0.10.1), python3-dev, gfortran, gcc (>= 4:4.6.1-5)
 Provides: ${python3:Provides}, ${numpy:Provides}, python3-numpy-dev, python3-f2py
 Description: Numerical Python adds a fast array facility to the Python language
  Numpy contains a powerful N-dimensional array object, sophisticated

Added: packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
===================================================================
--- packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2012-04-10 22:37:09 UTC (rev 21168)
@@ -0,0 +1,24 @@
+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-04-10 21:57:15 UTC (rev 21167)
+++ packages/numpy/trunk/debian/patches/series	2012-04-10 22:37:09 UTC (rev 21168)
@@ -6,3 +6,4 @@
 20_sphinx_1.1.2.diff
 30_fix_unicode_mgmt_py27-32.patch
 40_m68k_long_double_format.diff
+50_search-multiarch-paths.patch