[adios] 17/18: Adjust build for native adios py3

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.10.1-1
in repository adios.

commit 640320d4a89805182da12377336848a1c92c0828
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Oct 23 00:05:16 2016 +0100

    Adjust build for native adios py3
---
 debian/rules | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7b392de..9601981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,24 +98,13 @@ override_dh_auto_install:
 	install -D -m 644  adios.pc $(TOP)/debian/tmp/$(LIBDIR)/pkgconfig/adios.pc
 	# Sort python stuff
 	mkdir -p $(TOP)/debian/tmp/usr/lib/python3/dist-packages
-	mkdir -p $(TOP)/debian/tmp/usr/lib/${PY2VERS}/dist-packages
-	for p in $(PY3VERS); do \
-		v=`echo $$p | cut -c7,9` ;\
-		CYV=cpython-$${v}m ;\
-		CYVM=cpython-$${v}m-${DEB_HOST_MULTIARCH} ;\
-		if [ $$p = python3.5 ]; then \
-			CYV=$$CYVM ;\
-		fi;\
-		mv $(TOP)/debian/tmpp/lib/$${p}/site-packages/adios3.$${CYV}.so \
-			debian/tmp/usr/lib/python3/dist-packages/adios.$${CYVM}.so  ; \
-		mv $(TOP)/debian/tmpp/lib/$${p}/site-packages/adios3_mpi.$${CYV}.so \
-			debian/tmp/usr/lib/python3/dist-packages/adios_mpi.$${CYVM}.so  ; \
-	done
-	mv $(TOP)/debian/tmpp/lib/${PY2VERS}/site-packages/adios_mpi.so \
-		debian/tmp/usr/lib/${PY2VERS}/dist-packages/adios_mpi.${DEB_HOST_MULTIARCH}.so
-	mv $(TOP)/debian/tmpp/lib/${PY2VERS}/site-packages/adios.so \
-		debian/tmp/usr/lib/${PY2VERS}/dist-packages/adios.${DEB_HOST_MULTIARCH}.so
-	rm -r debian/tmpp
+	mkdir -p $(TOP)/debian/tmp/usr/lib/${PY2VERS}/dist-packages§
+	cp -a $(TOP)/debian/tmpp/lib/${PY2VERS}/site-packages/* debian/tmp/usr/lib/${PY2VERS}/dist-packages 
+	cp -a $(TOP)/debian/tmpp/lib/${PY3VERS}/site-packages/* debian/tmp/usr/lib/python3/dist-packages
+	mv $(TOP)/debian/tmp/lib/${PY2VERS}/dist-packages/adios_mpi/adios_mpi.so \
+               debian/tmp/usr/lib/${PY2VERS}/dist-packages/adios_mpi/adios_mpi.${DEB_HOST_MULTIARCH}.so
+	mv $(TOP)/debian/tmp/lib/${PY2VERS}/dist-packages/adios.so \
+               debian/tmp/usr/lib/${PY2VERS}/dist-packages/adios/adios.${DEB_HOST_MULTIARCH}.so
 	# remove due to it not working in multi-arch;
 	rm -f  $(BINDIR)/adios_config.flags
 	# renamed as per Adios CCS issue #118716, Debbug #639257

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