[Python-modules-commits] r23405 - in packages/scipy/trunk/debian (3 files)

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

    Date: Sunday, January 27, 2013 @ 16:53:15
  Author: jtaylor-guest
Revision: 23405

add multiarch python3.3 compat patch

Added:
  packages/scipy/trunk/debian/patches/python3.3-incdir.diff
Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/patches/series

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2013-01-27 16:53:07 UTC (rev 23404)
+++ packages/scipy/trunk/debian/changelog	2013-01-27 16:53:15 UTC (rev 23405)
@@ -7,9 +7,11 @@
       - dtype.diff,
       - kolmogorov.diff,
       - up_minpack_ints.diff
-    - new: BUG-remove-inline-statement-rejected-by-cython.patch
-    - new: BUG-fix-dependency-on-dict-ordering-in-test.patch
-    - new: fix-test_basic.py-cephes_vs_amos_mass_te.patch
+    - new patches:
+      - BUG-remove-inline-statement-rejected-by-cython.patch
+      - BUG-fix-dependency-on-dict-ordering-in-test.patch
+      - fix-test_basic.py-cephes_vs_amos_mass_te.patch
+      - python3.3-incdir.diff
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Fri, 25 Jan 2013 23:54:43 +0100
 

Added: packages/scipy/trunk/debian/patches/python3.3-incdir.diff
===================================================================
--- packages/scipy/trunk/debian/patches/python3.3-incdir.diff	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/python3.3-incdir.diff	2013-01-27 16:53:15 UTC (rev 23405)
@@ -0,0 +1,64 @@
+Description: add platform specific include directories
+Author: Matthias Klose <doko at ubuntu.com>
+Forwarded: https://github.com/scipy/scipy/pull/379
+Index: b/scipy/spatial/SConscript
+===================================================================
+--- a/scipy/spatial/SConscript	2011-03-10 01:40:54.000000000 +0000
++++ b/scipy/spatial/SConscript	2012-10-23 14:21:23.582321642 +0000
+@@ -7,7 +7,10 @@
+ from numscons import write_info
+ 
+ env = GetNumpyEnvironment(ARGUMENTS)
+-env.PrependUnique(CPPPATH=[get_numpy_include_dirs(), get_python_inc(),
++inc_dirs = [get_python_inc()]
++if inc_dirs[0] != get_python_inc(plat_specific=1):
++    inc_dirs.append(get_python_inc(plat_specific=1))
++env.PrependUnique(CPPPATH=[get_numpy_include_dirs(), inc_dirs,
+                            env["PYEXTCPPPATH"]])
+ 
+ #=======================
+Index: b/scipy/spatial/setup.py
+===================================================================
+--- a/scipy/spatial/setup.py	2011-03-10 01:40:54.000000000 +0000
++++ b/scipy/spatial/setup.py	2012-10-23 14:19:14.842324162 +0000
+@@ -16,10 +16,14 @@
+                  'random.c', 'rboxlib.c', 'stat.c', 'user.c', 'usermem.c',
+                  'userprintf.c']
+ 
++    inc_dirs = [get_python_inc()]
++    if inc_dirs[0] != get_python_inc(plat_specific=1):
++        inc_dirs.append(get_python_inc(plat_specific=1))
++    inc_dirs.append(get_numpy_include_dirs())
++
+     config.add_library('qhull',
+                        sources=[join('qhull', 'src', x) for x in qhull_src],
+-                       include_dirs=[get_python_inc(),
+-                                     get_numpy_include_dirs()],
++                       include_dirs=inc_dirs,
+                        # XXX: GCC dependency!
+                        #extra_compiler_args=['-fno-strict-aliasing'],
+                        )
+Index: b/scipy/special/setup.py
+===================================================================
+--- a/scipy/special/setup.py	2011-09-25 16:06:47.000000000 +0000
++++ b/scipy/special/setup.py	2012-10-23 14:23:42.110319714 +0000
+@@ -23,12 +23,17 @@
+ #        define_macros.append(('NONANS',None))
+         define_macros.append(('_USE_MATH_DEFINES',None))
+ 
++    inc_dirs = [get_python_inc()]
++    if inc_dirs[0] != get_python_inc(plat_specific=1):
++        inc_dirs.append(get_python_inc(plat_specific=1))
++    inc_dirs.append(get_numpy_include_dirs())
++
+     # C libraries
+     config.add_library('sc_c_misc',sources=[join('c_misc','*.c')],
+-                       include_dirs=[get_python_inc(), get_numpy_include_dirs()],
++                       include_dirs=inc_dirs,
+                        macros=define_macros)
+     config.add_library('sc_cephes',sources=[join('cephes','*.c')],
+-                       include_dirs=[get_python_inc(), get_numpy_include_dirs()],
++                       include_dirs=inc_dirs,
+                        macros=define_macros)
+ 
+     # Fortran libraries

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2013-01-27 16:53:07 UTC (rev 23404)
+++ packages/scipy/trunk/debian/patches/series	2013-01-27 16:53:15 UTC (rev 23405)
@@ -3,4 +3,5 @@
 blitz++.patch
 BUG-fix-dependency-on-dict-ordering-in-test.patch
 BUG-remove-inline-statement-rejected-by-cython.patch
-fix-test_basic.py-cephes_vs_amos_mass_te.patch
\ No newline at end of file
+fix-test_basic.py-cephes_vs_amos_mass_te.patch
+python3.3-incdir.diff