[adios] 02/02: Fix support for multiple py3 versions. Closes: #867177

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository adios.

commit 38b4c536d57f0916eb1379104d4352f212e0e07f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 4 16:01:11 2017 +0100

    Fix support for multiple py3 versions. Closes: #867177
---
 debian/changelog |  5 ++---
 debian/control   | 11 -----------
 debian/rules     |  6 ++++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 731dc10..2ce8ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-adios (1.11.0-2) UNRELEASED; urgency=medium
+adios (1.11.0-2) unstable; urgency=medium
 
-  * Split libadios-docs from libadios-dev and put examples there,
-    for multiarch.
+  * Fix support for multiple py3 versions. Closes: #867177
   * S-V: 4.0.0. No other changes required
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 21 Apr 2017 10:25:50 +0100
diff --git a/debian/control b/debian/control
index c794d7c..c82e53f 100644
--- a/debian/control
+++ b/debian/control
@@ -33,17 +33,6 @@ Description: ADIOS Adaptable IO system for simulations
  how you wish to process them this run, the routines in the host code
  (either Fortran or C) can transparently change how they process the data.
 
-Package: libadios-docs
-Architecture: all
-Depends: ${misc:Depends}
-Description: Documentation and examples for the ADIOS  Adaptable IO system
- The Adaptable IO System (ADIOS) provides a simple, flexible way for scientists
- to describe the data in their code that may need to be written, read,
- or processed outside of the running simulation. By providing an external
- to the code XML file describing the various elements, their types, and
- how you wish to process them this run, the routines in the host code
- (either Fortran or C) can transparently change how they process the data.
-
 Package: libadios-bin
 Depends:  ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 68adc56..30d8737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ DEB_HOST_MULTIARCH:=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 BINDIR:=$(DESTDIR)/usr/bin
 PY2VERS:=python2.7
-PY3VERS:= $(shell py3versions -s)
+PY3VERS:= $(shell py3versions -S)
 CFLAGS:=$(shell  dpkg-buildflags --get CFLAGS )
 
 TOP:=$(shell pwd)
@@ -100,7 +100,9 @@ override_dh_auto_install:
 	mkdir -p $(TOP)/debian/tmp/usr/lib/python3/dist-packages
 	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
+	for p in $(PY3VERS) ; do \
+		cp -a $(TOP)/debian/tmpp/lib/$$p/site-packages/* debian/tmp/usr/lib/python3/dist-packages ; \
+		done
 	mv $(TOP)/debian/tmp/usr/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/usr/lib/${PY2VERS}/dist-packages/adios/adios.so \

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