[adios] 126/207: Fix mixing of python3 modules

[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 38ff430066e2f86b7f2a3cde23e6049ec480babb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 18:01:14 2014 +0100

    Fix mixing of python3 modules
---
 debian/rules | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index a11944a..1e468a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,7 @@ override_dh_auto_configure:
 		echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$(p)m.so" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
 		echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
 		echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "wrappers/numpy/build_$$p/adios.so	/usr/lib/python3/dist-packages/adios" >> debian/python3-adios.install ; \
+		echo "wrappers/numpy/build_$$p/*.so	/usr/lib/python3/dist-packages/adios" >> debian/python3-adios.install ; \
 	done
 		
 
@@ -92,7 +92,10 @@ 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/build_$$p && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ; done
+		( cd wrappers/numpy/build_$$p && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ;\
+		V=`echo $$p | cut -c7,8` ;\
+		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/*
 	# Now do the static build we want.

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