[python-scientific] 01/02: revert experimental changes

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository python-scientific.

commit 6b64564f4917a98c8506291184bf74353c3f7765
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Aug 2 22:55:47 2014 +0200

    revert experimental changes
---
 debian/control  | 4 ++--
 debian/gbp.conf | 2 +-
 debian/rules    | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 19154e2..68efb2f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cython,
                debhelper (>= 9),
                libmpich-dev,
                libnetcdf-dev,
-               libopenmpi-dev,
+               libopenmpi-dev [alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386],
                python-all-dev,
                python-numpy
 Standards-Version: 3.9.5
@@ -82,7 +82,7 @@ Description: MPI-enhanced Python interpreter (MPICH2 based version)
  message-based parallel programming) support.
 
 Package: openmpipython
-Architecture: any
+Architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
 Priority: extra
 Depends: ${misc:Depends},
          ${python:Depends},
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 5bbe4e7..64eaff8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
 pristine-tar=True
-debian-branch=experimental
+debian-branch=master
diff --git a/debian/rules b/debian/rules
index d9247c1..472e666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ export DH_VERBOSE=1
 
 export COMPILE_CYTHON=1
 
+OPENMPI_ARCH = alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pv = $(shell pyversions -vd)
@@ -27,8 +28,10 @@ override_dh_auto_build:
 #       build the MPI part
 	rm -f Src/MPI/*.o
 	cd Src/MPI && PYTHONPATH=$$(echo $(CURDIR)/build/lib.*-$(pv)) USE_MPICH=yes   $(PYTHON) compile.py
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OPENMPI_ARCH)))
 	rm -f Src/MPI/*.o
 	cd Src/MPI && PYTHONPATH=$$(echo $(CURDIR)/build/lib.*-$(pv)) USE_OPENMPI=yes $(PYTHON) compile.py
+endif
 
 override_dh_auto_test:
 	dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-scientific.git