> I'd rather advise to figure out why a Conflicts: is declared in the
> first place. It seems needed, given the changelog of python-numpy (the
> version gets upgraded), but undocumented there. You probably want to ask
> its maintainer.
I don't know why it conflicts, but the attached patch makes scipy
build with the current unstable (builds in pbuilder), it installs and
it can be used from python (I even fixed some DeprecationWarnings).
The patch only modifies the Debian directory. For the maintainer: the
package should be ready for upload, feel free to ask me for details
about the patch. If you agree, it would be nice, if it could be
uploaded soon, because scipy is uninstallable for almost two months.
Ondrej
Index: debian/control
===================================================================
--- debian/control (revision 140)
+++ debian/control (revision 144)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: José Fonseca <[EMAIL PROTECTED]>
Uploaders: Alexandre Fayolle <[EMAIL PROTECTED]>, Marco Presi (Zufus) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, sharutils, python-central (>= 0.5), python-numpy-dev (>= 1:1.0.1), g77, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, fftw-dev, swig, libufsparse-dev, netcdfg-dev, dpatch, libx11-dev
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, sharutils, python-central (>= 0.5), python-numpy (>= 1:1.0.3-1), python-numpy-dev (>= 1:1.0.3-1), g77, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, fftw-dev, swig, libufsparse-dev, netcdfg-dev, dpatch, libx11-dev
XS-Python-Version: all
Standards-Version: 3.7.2
Index: debian/changelog
===================================================================
--- debian/changelog (revision 140)
+++ debian/changelog (revision 144)
@@ -1,3 +1,10 @@
+python-scipy (0.5.2-8) unstable; urgency=low
+
+ [Ondrej Certik]
+ * Make the package build in unstable again
+
+ -- Marco Presi (Zufus) <[EMAIL PROTECTED]> Wed, 15 Aug 2007 18:19:31 +0200
+
python-scipy (0.5.2-7) unstable; urgency=low
* Added 'm86k' among the archs on which xplt should not build.
Index: debian/patches/__init__.py.dpatch
===================================================================
--- debian/patches/__init__.py.dpatch (revision 0)
+++ debian/patches/__init__.py.dpatch (revision 144)
@@ -0,0 +1,28 @@
+#! /bin/sh -e
+
+# DP: Modified
+
+if [ $# -ne 1 ]; then
+ echo >&2 "$0: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f -p0 < $0;;
+ -unpatch) patch -f -R -p0 < $0;;
+ *)
+ echo >&2 "$0: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
[EMAIL PROTECTED]@
+--- Lib.orig/misc/__init__.py
++++ Lib/misc/__init__.py
+@@ -21,5 +21,5 @@
+
+ __all__ += common.__all__
+
+-from numpy.testing import ScipyTest
+-test = ScipyTest().test
++from numpy.testing import NumpyTest
++test = NumpyTest().test
Index: debian/patches/umfpack.dpatch
===================================================================
--- debian/patches/umfpack.dpatch (revision 140)
+++ debian/patches/umfpack.dpatch (revision 144)
@@ -23,14 +23,14 @@
%{
-#include <umfpack.h>
-+#include <ufsparse/umfpack.h>
++#include <suitesparse/umfpack.h>
#include "numpy/arrayobject.h"
%}
%feature("autodoc", "1");
-#include <umfpack.h>
-+#include <ufsparse/umfpack.h>
++#include <suitesparse/umfpack.h>
%init %{
import_array();
@@ -50,18 +50,18 @@
-%include <umfpack_report_numeric.h>
-%include <umfpack_report_info.h>
-%include <umfpack_report_control.h>
-+%include <ufsparse/umfpack.h>
-+%include <ufsparse/umfpack_solve.h>
-+%include <ufsparse/umfpack_defaults.h>
-+%include <ufsparse/umfpack_triplet_to_col.h>
-+%include <ufsparse/umfpack_col_to_triplet.h>
-+%include <ufsparse/umfpack_transpose.h>
-+%include <ufsparse/umfpack_scale.h>
++%include <suitesparse/umfpack.h>
++%include <suitesparse/umfpack_solve.h>
++%include <suitesparse/umfpack_defaults.h>
++%include <suitesparse/umfpack_triplet_to_col.h>
++%include <suitesparse/umfpack_col_to_triplet.h>
++%include <suitesparse/umfpack_transpose.h>
++%include <suitesparse/umfpack_scale.h>
+
-+%include <ufsparse/umfpack_report_symbolic.h>
-+%include <ufsparse/umfpack_report_numeric.h>
-+%include <ufsparse/umfpack_report_info.h>
-+%include <ufsparse/umfpack_report_control.h>
++%include <suitesparse/umfpack_report_symbolic.h>
++%include <suitesparse/umfpack_report_numeric.h>
++%include <suitesparse/umfpack_report_info.h>
++%include <suitesparse/umfpack_report_control.h>
/*
The order is important below!
@@ -71,8 +71,8 @@
-%include <umfpack_symbolic.h>
-%include <umfpack_numeric.h>
-+%include <ufsparse/umfpack_symbolic.h>
-+%include <ufsparse/umfpack_numeric.h>
++%include <suitesparse/umfpack_symbolic.h>
++%include <suitesparse/umfpack_numeric.h>
OPAQUE_ARGINOUT( void * )
@@ -82,8 +82,8 @@
-%include <umfpack_free_symbolic.h>
-%include <umfpack_free_numeric.h>
-+%include <ufsparse/umfpack_free_symbolic.h>
-+%include <ufsparse/umfpack_free_numeric.h>
++%include <suitesparse/umfpack_free_symbolic.h>
++%include <suitesparse/umfpack_free_numeric.h>
@@ -92,7 +92,7 @@
long *nz_udiag
};
-%include <umfpack_get_lunz.h>
-+%include <ufsparse/umfpack_get_lunz.h>
++%include <suitesparse/umfpack_get_lunz.h>
ARRAY_IN( double, double, DOUBLE )
@@ -101,4 +101,4 @@
};
%apply int *OUTPUT { int *do_recip};
-%include <umfpack_get_numeric.h>
-+%include <ufsparse/umfpack_get_numeric.h>
++%include <suitesparse/umfpack_get_numeric.h>
Index: debian/patches/00list
===================================================================
--- debian/patches/00list (revision 140)
+++ debian/patches/00list (revision 144)
@@ -3,3 +3,6 @@
sandbox.dpatch
umfpack.dpatch
montecarlo_tests.dpatch
+getpath.dpatch
+montecarlo.py.dpatch
+__init__.py.dpatch
Index: debian/patches/montecarlo.py.dpatch
===================================================================
--- debian/patches/montecarlo.py.dpatch (revision 0)
+++ debian/patches/montecarlo.py.dpatch (revision 144)
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+
+# DP: Modified
+
+if [ $# -ne 1 ]; then
+ echo >&2 "$0: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f -p0 < $0;;
+ -unpatch) patch -f -R -p0 < $0;;
+ *)
+ echo >&2 "$0: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
[EMAIL PROTECTED]@
+--- Lib.orig/sandbox/montecarlo/montecarlo.py
++++ Lib/sandbox/montecarlo/montecarlo.py
+@@ -3,9 +3,10 @@
+ # Copyright: Ed Schofield, 2005-2006
+ # License: BSD-style (see LICENSE.txt at root of scipy tree)
+
++from __future__ import division
++
+ __author__ = "Ed Schofield"
+
+-from __future__ import division
+ import numpy
+ import scipy
+ from scipy.sandbox.montecarlo._intsampler import _intsampler
Index: debian/patches/getpath.dpatch
===================================================================
--- debian/patches/getpath.dpatch (revision 0)
+++ debian/patches/getpath.dpatch (revision 144)
@@ -0,0 +1,126 @@
+#! /bin/sh -e
+
+# DP: Modified
+
+if [ $# -ne 1 ]; then
+ echo >&2 "$0: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f -p0 < $0;;
+ -unpatch) patch -f -R -p0 < $0;;
+ *)
+ echo >&2 "$0: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
[EMAIL PROTECTED]@
+diff -Nur Lib.orig/linalg/setup_atlas_version.py Lib/linalg/setup_atlas_version.py
+--- Lib.orig/linalg/setup_atlas_version.py 2006-03-15 02:29:45.000000000 +0000
++++ Lib/linalg/setup_atlas_version.py 2007-06-06 16:43:08.000000000 +0100
+@@ -4,14 +4,14 @@
+
+ import os
+ from distutils.core import Extension
+-from numpy.distutils.misc_util import get_path, default_config_dict
++from numpy.distutils.misc_util import get_path_from_frame, default_config_dict
+ from numpy.distutils.system_info import get_info,AtlasNotFoundError
+
+ def configuration (parent_package=''):
+ package = 'linalg'
+ config = default_config_dict(package,parent_package)
+ del config['fortran_libraries']
+- local_path = get_path(__name__)
++ local_path = get_path_from_frame(__name__)
+ atlas_info = get_info('atlas_threads')
+ if not atlas_info:
+ atlas_info = get_info('atlas')
+diff -Nur Lib.orig/odr/setup.py Lib/odr/setup.py
+--- Lib.orig/odr/setup.py 2006-12-02 03:24:44.000000000 +0000
++++ Lib/odr/setup.py 2007-06-06 16:43:08.000000000 +0100
+@@ -6,7 +6,7 @@
+ import warnings
+
+ from numpy.distutils.core import Extension
+-from numpy.distutils.misc_util import get_path, Configuration, dot_join
++from numpy.distutils.misc_util import get_path_from_frame, Configuration, dot_join
+
+ from numpy.distutils.system_info import get_info,dict_append,\
+ AtlasNotFoundError,LapackNotFoundError,BlasNotFoundError,\
+diff -Nur Lib.orig/sandbox/ga/setup_ga.py Lib/sandbox/ga/setup_ga.py
+--- Lib.orig/sandbox/ga/setup_ga.py 2006-01-05 03:35:26.000000000 +0000
++++ Lib/sandbox/ga/setup_ga.py 2007-06-06 16:43:08.000000000 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+
+ import os
+-from numpy.distutils.misc_util import get_path, default_config_dict
++from numpy.distutils.misc_util import get_path_from_frame, default_config_dict
+
+ def configuration(parent_package='',parent_path=None):
+ package = 'ga'
+diff -Nur Lib.orig/sandbox/gplt/setup_gplt.py Lib/sandbox/gplt/setup_gplt.py
+--- Lib.orig/sandbox/gplt/setup_gplt.py 2006-01-05 03:35:31.000000000 +0000
++++ Lib/sandbox/gplt/setup_gplt.py 2007-06-06 16:43:08.000000000 +0100
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env python
+
+ import os, sys
+-from numpy.distutils.misc_util import get_path, default_config_dict
++from numpy.distutils.misc_util import get_path_from_frame, default_config_dict
+
+ def configuration(parent_package='',parent_path=None):
+ package = 'gplt'
+- local_path = get_path(__name__,parent_path)
++ local_path = get_path_from_frame(__name__,parent_path)
+ config = default_config_dict(package,parent_package)
+
+ if sys.platform == 'win32':
+diff -Nur Lib.orig/sandbox/image/setup_image.py Lib/sandbox/image/setup_image.py
+--- Lib.orig/sandbox/image/setup_image.py 2006-03-15 02:29:18.000000000 +0000
++++ Lib/sandbox/image/setup_image.py 2007-06-06 16:43:08.000000000 +0100
+@@ -6,12 +6,12 @@
+ def configuration(parent_package='', parent_path=None):
+ from numpy.distutils.system_info import get_info, dict_append
+ from numpy.distutils.misc_util import default_config_dict, \
+- dot_join, get_path
++ dot_join, get_path_from_frame
+
+ package = 'image'
+ config = default_config_dict(package,parent_package)
+
+- local_path = get_path(__name__, parent_path)
++ local_path = get_path_from_frame(__name__, parent_path)
+ image_path = os.path.join(parent_package,'image')
+
+ color_files = glob(os.path.join(local_path, '*.txt'))
+diff -Nur Lib.orig/sandbox/plt/setup_plt.py Lib/sandbox/plt/setup_plt.py
+--- Lib.orig/sandbox/plt/setup_plt.py 2006-01-13 00:08:11.000000000 +0000
++++ Lib/sandbox/plt/setup_plt.py 2007-06-06 16:43:08.000000000 +0100
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env python
+
+ import os
+-from numpy.distutils.misc_util import get_path, default_config_dict
++from numpy.distutils.misc_util import get_path_from_frame, default_config_dict
+
+ def configuration(parent_package='',parent_path=None):
+ package = 'plt'
+- local_path = get_path(__name__,parent_path)
++ local_path = get_path_from_frame(__name__,parent_path)
+ config = default_config_dict(package,parent_package)
+ return config
+
+diff -Nur Lib.orig/sandbox/pysparse/setup.py Lib/sandbox/pysparse/setup.py
+--- Lib.orig/sandbox/pysparse/setup.py 2006-03-15 02:29:36.000000000 +0000
++++ Lib/sandbox/pysparse/setup.py 2007-06-06 16:43:08.000000000 +0100
+@@ -12,7 +12,7 @@
+
+ import os
+ from numpy.distutils.core import Extension
+-from numpy.distutils.misc_util import get_path,Configuration,dot_join
++from numpy.distutils.misc_util import get_path_from_frame,Configuration,dot_join
+ join = os.path.join
+ import glob
+
