[Python-modules-commits] r7087 - in packages/scipy/trunk/debian (6 files)

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

    Date: Monday, December 8, 2008 @ 16:06:41
  Author: certik-guest
Revision: 7087

Preparing the packaging to work with 0.7.0b1. It is not ready for upload, we
should wait for a final upstream release.

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/patches/series
  packages/scipy/trunk/debian/patches/swig_ftbfs.dpatch
  packages/scipy/trunk/debian/patches/umfpack.dpatch
Deleted:
  packages/scipy/trunk/debian/patches/scipy_include_fix.diff
  packages/scipy/trunk/debian/patches/segfault.patch

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2008-12-08 14:54:46 UTC (rev 7086)
+++ packages/scipy/trunk/debian/changelog	2008-12-08 16:06:41 UTC (rev 7087)
@@ -1,3 +1,12 @@
+python-scipy (0.7.0b1-1) UNRELEASED; urgency=low
+
+  * Beta version
+  * debian/patches: scipy_include_fix.diff and segfault.patch removed (applied
+    upstream),  swig_ftbfs.dpatch and umfpack.dpatch updated to new paths
+
+
+ -- Ondrej Certik <ondrej at certik.cz>  Mon, 08 Dec 2008 17:04:54 +0100
+
 python-scipy (0.6.0-13) UNRELEASED; urgency=low
 
   * debian/control

Deleted: packages/scipy/trunk/debian/patches/scipy_include_fix.diff
===================================================================
--- packages/scipy/trunk/debian/patches/scipy_include_fix.diff	2008-12-08 14:54:46 UTC (rev 7086)
+++ packages/scipy/trunk/debian/patches/scipy_include_fix.diff	2008-12-08 16:06:41 UTC (rev 7087)
@@ -1,12 +0,0 @@
---- python-scipy-0.6.0.orig/scipy/linsolve/umfpack/setup.py
-+++ python-scipy-0.6.0/scipy/linsolve/umfpack/setup.py
-@@ -24,6 +24,7 @@
-     config.add_extension( '__umfpack',
-                           sources = [umfpack_i],
-                           depends = ['umfpack.i'],
-+                          include_dirs = ['/usr/include'],
-                           **build_info)
- 
-     return config
-only in patch2:
-unchanged:

Deleted: packages/scipy/trunk/debian/patches/segfault.patch
===================================================================
--- packages/scipy/trunk/debian/patches/segfault.patch	2008-12-08 14:54:46 UTC (rev 7086)
+++ packages/scipy/trunk/debian/patches/segfault.patch	2008-12-08 16:06:41 UTC (rev 7087)
@@ -1,17 +0,0 @@
-Index: python-scipy-0.6.0/scipy/ndimage/src/nd_image.h
-===================================================================
---- python-scipy-0.6.0.orig/scipy/ndimage/src/nd_image.h	2007-12-03 15:37:20.384851591 +0100
-+++ python-scipy-0.6.0/scipy/ndimage/src/nd_image.h	2007-12-03 15:37:36.885791926 +0100
-@@ -273,12 +273,6 @@
-                                        NA_ByteOrder(), 1, 1);
- }
- 
--#define  NA_OutputArray (*(PyArrayObject* (*) (PyObject*,NumarrayType,int) ) (void *) NA_OutputArray)
--#define  NA_IoArray (*(PyArrayObject* (*) (PyObject*,NumarrayType,int) ) (void *) NA_IoArray)
--#define  NA_NewArray (*(PyArrayObject* (*) (void* buffer, NumarrayType, int, ...) ) (void *) NA_NewArray )
--#define  NA_elements (*(unsigned long (*) (PyArrayObject*) ) (void *) NA_elements)
--#define  NA_InputArray (*(PyArrayObject* (*) (PyObject*,NumarrayType,int) ) (void *) NA_InputArray)
--
- #endif /* ND_IMPORT_ARRAY */
- 
- #endif /* ND_IMAGE_H */

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2008-12-08 14:54:46 UTC (rev 7086)
+++ packages/scipy/trunk/debian/patches/series	2008-12-08 16:06:41 UTC (rev 7087)
@@ -1,3 +1,2 @@
-segfault.patch
 umfpack.dpatch
 swig_ftbfs.dpatch

Modified: packages/scipy/trunk/debian/patches/swig_ftbfs.dpatch
===================================================================
--- packages/scipy/trunk/debian/patches/swig_ftbfs.dpatch	2008-12-08 14:54:46 UTC (rev 7086)
+++ packages/scipy/trunk/debian/patches/swig_ftbfs.dpatch	2008-12-08 16:06:41 UTC (rev 7087)
@@ -5,8 +5,8 @@
 ## DP: Fix swig to look in `/usr/include' for includes.
 
 @DPATCH@
---- python-scipy-0.6.0.orig/scipy/linsolve/umfpack/setup.py
-+++ python-scipy-0.6.0/scipy/linsolve/umfpack/setup.py
+--- python-scipy-0.6.0.orig/scipy/sparse/linalg/dsolve/umfpack/setup.py
++++ python-scipy-0.6.0/scipy/sparse/linalg/dsolve/umfpack/setup.py
 @@ -24,6 +24,7 @@
      config.add_extension( '__umfpack',
                            sources = [umfpack_i],

Modified: packages/scipy/trunk/debian/patches/umfpack.dpatch
===================================================================
--- packages/scipy/trunk/debian/patches/umfpack.dpatch	2008-12-08 14:54:46 UTC (rev 7086)
+++ packages/scipy/trunk/debian/patches/umfpack.dpatch	2008-12-08 16:06:41 UTC (rev 7087)
@@ -1,7 +1,7 @@
 Index: python-scipy-0.6.0/scipy/linsolve/umfpack/umfpack.i
 ===================================================================
---- python-scipy-0.6.0.orig/scipy/linsolve/umfpack/umfpack.i	2007-12-03 15:20:37.827719117 +0100
-+++ python-scipy-0.6.0/scipy/linsolve/umfpack/umfpack.i	2007-12-03 15:20:51.328488481 +0100
+--- python-scipy-0.6.0.orig/scipy/sparse/linalg/dsolve/umfpack/umfpack.i	2007-12-03 15:20:37.827719117 +0100
++++ python-scipy-0.6.0/scipy/sparse/linalg/dsolve/umfpack/umfpack.i	2007-12-03 15:20:51.328488481 +0100
 @@ -10,13 +10,13 @@
  */