[Python-modules-commits] r26364 - in packages/numpy/trunk/debian (6 files)

[morph at users.alioth.debian.org]

    Date: Saturday, November 2, 2013 @ 09:43:50
  Author: morph
Revision: 26364

* debian/patches/*
  - refreshed

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/02_build_dotblas.patch
  packages/numpy/trunk/debian/patches/03_force_f2py_version.patch
  packages/numpy/trunk/debian/patches/10_use_local_python.org_object.inv_sphinx.diff
  packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2013-11-02 09:41:18 UTC (rev 26363)
+++ packages/numpy/trunk/debian/changelog	2013-11-02 09:43:50 UTC (rev 26364)
@@ -7,8 +7,10 @@
     - removed, obsolete
   * debian/patches/40_m68k_long_double_format.diff
     - removed, merged upstream
+  * debian/patches/*
+    - refreshed
 
- -- Sandro Tosi <morph at debian.org>  Sat, 02 Nov 2013 10:41:02 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 02 Nov 2013 10:43:37 +0100
 
 python-numpy (1:1.7.1-3) unstable; urgency=medium
 

Modified: packages/numpy/trunk/debian/patches/02_build_dotblas.patch
===================================================================
--- packages/numpy/trunk/debian/patches/02_build_dotblas.patch	2013-11-02 09:41:18 UTC (rev 26363)
+++ packages/numpy/trunk/debian/patches/02_build_dotblas.patch	2013-11-02 09:43:50 UTC (rev 26364)
@@ -1,17 +1,15 @@
 Patch to build _dotblas.c when ATLAS is not installed.
 
 Added by: Tiziano Zito <otizonaizit at yahoo.com>
-Index: python-numpy-1.1.0.new/numpy/core/setup.py
-===================================================================
---- python-numpy-1.1.0.old/numpy/core/setup.py 2008-05-26 09:39:44.000000000 +0200
-+++ python-numpy-1.1.0.new/numpy/core/setup.py 2008-07-08 13:37:23.000000000 +0200
-@@ -291,8 +291,8 @@
+--- a/numpy/core/setup.py
++++ b/numpy/core/setup.py
+@@ -929,8 +929,8 @@ def configuration(parent_package='',top_
      #blas_info = {}
      def get_dotblas_sources(ext, build_dir):
          if blas_info:
--            if ('NO_ATLAS_INFO',1) in blas_info.get('define_macros',[]):
+-            if ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', []):
 -                return None # dotblas needs ATLAS, Fortran compiled blas will not be sufficient.
-+            #if ('NO_ATLAS_INFO',1) in blas_info.get('define_macros',[]):
++            #if ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', []):
 +            #    return None # dotblas needs ATLAS, Fortran compiled blas will not be sufficient.
              return ext.depends[:1]
          return None # no extension module will be built

Modified: packages/numpy/trunk/debian/patches/03_force_f2py_version.patch
===================================================================
--- packages/numpy/trunk/debian/patches/03_force_f2py_version.patch	2013-11-02 09:41:18 UTC (rev 26363)
+++ packages/numpy/trunk/debian/patches/03_force_f2py_version.patch	2013-11-02 09:43:50 UTC (rev 26364)
@@ -1,10 +1,8 @@
 Description: force generation f2py postfixed with interpreter version
 
-Index: python-numpy-1.3.0/numpy/f2py/setup.py
-===================================================================
---- python-numpy-1.3.0.orig/numpy/f2py/setup.py	2009-07-25 08:42:47.000000000 -0500
-+++ python-numpy-1.3.0/numpy/f2py/setup.py	2009-07-25 08:52:40.000000000 -0500
-@@ -40,7 +40,7 @@
+--- a/numpy/f2py/setup.py
++++ b/numpy/f2py/setup.py
+@@ -43,7 +43,7 @@ def configuration(parent_package='',top_
      config.make_svn_version_py()
  
      def generate_f2py_py(build_dir):

Modified: packages/numpy/trunk/debian/patches/10_use_local_python.org_object.inv_sphinx.diff
===================================================================
--- packages/numpy/trunk/debian/patches/10_use_local_python.org_object.inv_sphinx.diff	2013-11-02 09:41:18 UTC (rev 26363)
+++ packages/numpy/trunk/debian/patches/10_use_local_python.org_object.inv_sphinx.diff	2013-11-02 09:43:50 UTC (rev 26364)
@@ -1,10 +1,8 @@
 Description: Use a local copy of object.inv from doc.python.org, instead of downloading it each time from the internet
 
-Index: python-numpy-1.4.1/doc/source/conf.py
-===================================================================
---- python-numpy-1.4.1.orig/doc/source/conf.py	2010-07-13 00:25:45.059911225 +0200
-+++ python-numpy-1.4.1/doc/source/conf.py	2010-07-13 00:26:47.816913315 +0200
-@@ -205,7 +205,7 @@
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -199,7 +199,7 @@ texinfo_documents = [
  # -----------------------------------------------------------------------------
  # Intersphinx configuration
  # -----------------------------------------------------------------------------

Modified: packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
===================================================================
--- packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2013-11-02 09:41:18 UTC (rev 26363)
+++ packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2013-11-02 09:43:50 UTC (rev 26364)
@@ -7,7 +7,7 @@
 
 --- a/numpy/distutils/system_info.py
 +++ b/numpy/distutils/system_info.py
-@@ -206,6 +206,16 @@ else:
+@@ -208,6 +208,16 @@ else:
      default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include',
                                  '/usr/include']
  

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2013-11-02 09:41:18 UTC (rev 26363)
+++ packages/numpy/trunk/debian/patches/series	2013-11-02 09:43:50 UTC (rev 26364)
@@ -3,5 +3,4 @@
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
 10_use_local_python.org_object.inv_sphinx.diff
-40_m68k_long_double_format.diff
 50_search-multiarch-paths.patch