[SCM] Packaging for python-scientific branch, master, updated. debian/2.8-3-1-gfb6691f

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit fb6691f4cedf1aa6eb3d915434f857a8cbcd1683
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Nov 4 22:52:37 2012 +0000

    Imported Debian patch 2.8-4

diff --git a/debian/changelog b/debian/changelog
index 0d5e4de..8b441c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-scientific (2.8-4) unstable; urgency=low
+
+  * QA upload.
+  * Use correct python platform value on kfreebsd (closes: #692281).
+  * Build-depend and depend python-numpy >= 1:1.6.1-1 due to ABI change
+    between numpy 1.5 and 1.6 (closes: #692318).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 04 Nov 2012 22:52:37 +0000
+
 python-scientific (2.8-3) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/control b/debian/control
index 858934f..e92d01f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
 Standards-Version: 3.9.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.6.6-12), libnetcdf-dev, python-numpy, libmpich2-dev, libopenmpi-dev [alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386]
+Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.6.6-12), libnetcdf-dev, python-numpy (>= 1:1.6.1-1), libmpich2-dev, libopenmpi-dev [alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386]
 
 Package: python-scientific
 Architecture: all
-Depends: ${python:Depends}, python-numpy, ${misc:Depends}
+Depends: ${python:Depends}, python-numpy (>= 1:1.6.1-1), ${misc:Depends}
 Recommends: python-netcdf (>= 2.4.11), python-tk (>= 2.4.3), pyro
 Suggests: python-scientific-doc
 Provides: ${python:Provides}
@@ -22,7 +22,7 @@ Description: Python modules useful for scientific computing
 
 Package: python-netcdf
 Architecture: any
-Depends: ${python:Depends}, python-numpy, ${shlibs:Depends}, python-scientific (>= ${source:Version}), ${misc:Depends}
+Depends: ${python:Depends}, python-numpy (>= 1:1.6.1-1), ${shlibs:Depends}, python-scientific (>= ${source:Version}), ${misc:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: netCDF interface for Python
diff --git a/debian/rules b/debian/rules
index 41825cf..dd0eef3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ export SHELL=bash
 pv	= $(shell pyversions -vd)
 PYVERS	= $(shell pyversions -vs)
 PYTHON	= /usr/bin/python #$(pv)
+PLATFORM = $(shell $(PYTHON) -c 'import sys; print sys.platform')
 
 p_sci	= python-scientific
 p_cdf	= python-netcdf
@@ -115,7 +116,7 @@ endif
 	-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*/*-packages/Scientific/linux2 \
+		usr/lib/python*/*-packages/Scientific/$(PLATFORM) \
 		usr/include/python*/Scientific/netcdfmodule.h
 
 	rm -rf $(d_sci)/usr/include

-- 
Packaging for python-scientific