[adios] 154/207: Merge python back

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit d9cc28d1e48f3aeec0d5b4ea3792588258f92684
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 14:42:38 2014 +0100

    Merge python back
---
 debian/rules | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index a446ab9..551c9c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,13 +67,15 @@ TOP:=$(shell pwd)
 override_dh_auto_clean:
 	dh_clean
 	find . -name '*.pyc' -delete
-	rm -fr wrappers/numpy/build_* wrappers/java/build
+	rm -fr wrappers/numpy/build_* wrappers/java/build debian/tmpp
 	rm -f debian/python3-adios.install
 
 override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
-		--with-hdf5=/usr --with-bzip2=/usr  --with-zlib=/usr --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
-	# Prep python wrapper. Cache these for cmake otherwise it will get 2.7, 3.* confused
+		--with-hdf5=/usr --with-bzip2=/usr  --with-zlib=/usr \
+		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
+	# Prep python wrapper. 
+	# Cache these for cmake otherwise it will get 2.7, 3.* confused
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
@@ -82,16 +84,19 @@ override_dh_auto_build:
 	mv debian/tmp/lib/*/*.a debian/tmp/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
 	for p in ${PY2} ${PY3VERS} ; do \
-		( cd wrappers/numpy && PATH=$(TOP):$(PATH) $$p ./setup.py install --prefix=$(TOP)/debian/tmpp ) ; \
-		( cd wrappers/numpy && PATH=$(TOP):$(PATH) $$p ./setup_mpi.py install --prefix=$(TOP)/debian/tmpp ) ; done
+		( cd wrappers/numpy && PATH=$(TOP):$(PATH) \
+			$$p ./setup.py     install --prefix=$(TOP)/debian/tmpp  ;\
+			$$p ./setup_mpi.py install --prefix=$(TOP)/debian/tmpp ) ; done
 	# for p in $(PY3VERS); do \
 #		v=`echo $$p | cut -c7,9` ;\
 #		mv wrappers/numpy/build_$${p}/adios.so wrappers/numpy/build_$${p}/adios.cpython-$${v}m-${DEB_HOST_MULTARCH}.so ;\
 #	done
 	# Clean up.
-#	rm -r debian/tmp/*
+	rm -r debian/tmp/*
 	# Now do the static build we want.
 	dh_auto_build
+	mv debian/tmpp/lib/* debian/tmp/usr/lib
+	rm -r debian/tmpp
 	
 override_dh_auto_install:
 	find . -name .gitignore -delete

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