tags 547852 + patch
tags 549477 + patch
thanks
Hi!
Please find attached a patch to fix the FTBFS due to netcdfg-dev, as
well as an update to build with Python 2.6. I have test built the
package in a normal sid chroot as well as a special Python 2.6 chroot
with a custom-built numpy (to get the 2.6 modules).
I hope this helps resolve the bugs.
Thanks, and HTH.
Kumar
diff -Nru --exclude changelog python-scientific-2.8/debian/control python-scientific-2.8/debian/control
--- python-scientific-2.8/debian/control 2009-10-17 13:10:27.000000000 -0500
+++ python-scientific-2.8/debian/control 2009-10-17 13:10:27.000000000 -0500
@@ -4,7 +4,7 @@
Maintainer: Matthias Klose <d...@debian.org>
Standards-Version: 3.8.3
XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), netcdfg-dev, python-numpy, libmpich1.0-dev, lam4-dev, python-central (>= 0.5)
+Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), libnetcdf-dev, python-numpy, libmpich1.0-dev, lam4-dev, python-central (>= 0.5)
Package: python-scientific
Architecture: all
diff -Nru --exclude changelog python-scientific-2.8/debian/rules python-scientific-2.8/debian/rules
--- python-scientific-2.8/debian/rules 2009-10-17 13:10:27.000000000 -0500
+++ python-scientific-2.8/debian/rules 2009-10-17 13:10:27.000000000 -0500
@@ -22,6 +22,8 @@
d_pympi = debian/$(p_pympi)
d_pylam = debian/$(p_pylam)
+include /usr/share/python/python.mk
+
xx:
@echo $(pv)
@echo '$(CURDIR)/build/lib.*-$(pv)'
@@ -43,12 +45,12 @@
touch stamp-build
cdf_dirs = \
- usr/lib/python$(pv)/site-packages \
+ usr/lib/python$(pv)/$(call py_sitename, $(pv)) \
usr/include/python$(pv) \
usr/share/doc/$(p_cdf)/examples
sci_dirs = \
- usr/lib/python$(pv)/site-packages \
+ usr/lib/python$(pv)/$(call py_sitename, $(pv)) \
usr/share/doc/$(p_sci)
doc_dirs = \
@@ -56,7 +58,7 @@
usr/share/doc/$(p_doc)
mpi_dirs = \
- usr/lib/python$(pv)/site-packages \
+ usr/lib/python$(pv)/$(call py_sitename, $(pv)) \
usr/share/doc/$(p_mpi)/examples \
usr/bin
@@ -84,14 +86,14 @@
set -e; \
for v in $(PYVERS); do \
- mkdir -p $(d_sci)/usr/lib/python$(pv)/site-packages; \
- mkdir -p $(d_cdf)/usr/lib/python$(pv)/site-packages; \
- python$$v setup.py install --root=`pwd`/$(d_sci); \
+ mkdir -p $(d_sci)/usr/lib/python$(v)/$(call py_sitename, $(v)); \
+ mkdir -p $(d_cdf)/usr/lib/python$(v)/$(call py_sitename, $(v)); \
+ python$$v setup.py install --root=`pwd`/$(d_sci) $(py_setup_install_args); \
done
-find debian -name '*.py[co]' | xargs rm -f
DH_COMPAT=2 dh_movefiles -v -p$(p_mpi) --sourcedir=$(d_sci) \
- usr/lib/python*/site-packages/Scientific/MPI \
+ usr/lib/python*/*-packages/Scientific/MPI \
usr/include/python*/Scientific/{PyMPI_API.h,mpimodule.h}
install -m775 Src/MPI/mpipython.mpich $(d_pympi)/usr/bin/
@@ -102,7 +104,7 @@
-find $(d_sci) $(d_sci2) -name '*.py[co]' | xargs rm -f
DH_COMPAT=2 dh_movefiles -v -p$(p_cdf) --sourcedir=$(d_sci) \
- usr/lib/python*/site-packages/Scientific/linux2 \
+ usr/lib/python*/*-packages/Scientific/linux2 \
usr/include/python*/Scientific/netcdfmodule.h
rm -rf $(d_sci)/usr/include
