[adios] 156/207: Next try.

[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 72c23eb1188a85a98663cb18b92f07278df7616e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 15:19:32 2014 +0100

    Next try.
---
 debian/rules | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index dec3d36..c737d53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,20 +88,25 @@ override_dh_auto_build:
 			$$p ./setup.py     install --prefix=$(TOP)/debian/tmpp  ;\
 			PATH=$(TOP):$(PATH) \
 			$$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/*
 	# 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
 	$(MAKE) install prefix=$(DESTDIR)/usr
+	# Sort python stuff
+	mv debian/tmpp/lib/* debian/tmp/usr/lib
+	mkdir -p $(TOP)/debian/tmp/usr/lib/python3/dist-packages
+	for p in $(PY3VERS); do \
+		v=`echo $$p | cut -c7,9` ;\
+		mv $(TOP)/debian/tmpp/lib/$${p}/sitr-packages/adios.so \
+			debian/tmp/usr/lib/python3/dist-packages/adios.cpython-$${v}m-${DEB_HOST_MULTARCH}.so  ; \
+	done
+	mv $(TOP)/lib/${PY2}/site-packages/adios.so \
+		debian/tmp/usr/lib/${PY2}/dist-packages/adios.cpython-$${v}m-${DEB_HOST_MULTARCH}.so
+	rm -r debian/tmpp
 	# 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