[adios] 182/207: Fix python3

[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 8bdf7f4e8b750a0d3ebcb60abfac61d698a486d7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jun 17 16:32:39 2014 +0100

    Fix python3
---
 debian/changelog             | 7 ++++---
 debian/patches/python3.patch | 8 ++++----
 debian/rules                 | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5417d3b..892f088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-adios (1.7.0-2) UNRELEASED; urgency=medium
+adios (1.7.0-2) unstable; urgency=medium
 
-  * PATH not inherited correctly. export it. 
+  * PATH not inherited correctly. export it.
+  * Cope with python3.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 17 Jun 2014 05:45:36 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 17 Jun 2014 08:45:36 +0100
 
 adios (1.7.0-1) unstable; urgency=medium
 
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index e5af217..92e32f0 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -768,14 +768,14 @@ Index: adios-1.7.0/wrappers/numpy/setup.py
  
  p = subprocess.Popen(["adios_config", "-c", "-s"], stdout=subprocess.PIPE)
 -for path in p.communicate()[0].strip().split(" "):
-+pp = p.communicate()[0].strip()
++pp = p.communicate()[0].decode(encoding='UTF-8').strip()
 +for path in str(pp).split(" "):
      if path.startswith('-I'):
          m1.include_dirs.append(path.replace('-I', '', 1))
  
  p = subprocess.Popen(["adios_config", "-l", "-s"], stdout=subprocess.PIPE)
 -for path in p.communicate()[0].strip().split(" "):
-+pp = p.communicate()[0].strip()
++pp = p.communicate()[0].decode(encoding='UTF-8').strip()
 +for path in str(pp).split(" "):
      if path.startswith('-L'):
          m1.library_dirs.append(path.replace('-L', '', 1))
@@ -789,14 +789,14 @@ Index: adios-1.7.0/wrappers/numpy/setup_mpi.py
  
  p = subprocess.Popen(["adios_config", "-c"], stdout=subprocess.PIPE)
 -for path in p.communicate()[0].strip().split(" "):
-+pp = p.communicate()[0].strip()
++pp = p.communicate()[0].decode(encoding='UTF-8').strip()
 +for path in str(pp).split(" "):
      if path.startswith('-I'):
          m1.include_dirs.append(path.replace('-I', '', 1))
  
  p = subprocess.Popen(["adios_config", "-l"], stdout=subprocess.PIPE)
 -for path in p.communicate()[0].strip().split(" "):
-+pp = p.communicate()[0].strip()
++pp = p.communicate()[0].decode(encoding='UTF-8').strip()
 +for path in str(pp).split(" "):
      if path.startswith('-L'):
          m1.library_dirs.append(path.replace('-L', '', 1))
diff --git a/debian/rules b/debian/rules
index 21ed609..79f7cfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ PY2:=python2.7
 PY3VERS:= $(shell py3versions -s)
 
 TOP:=$(shell pwd)
-export PATH=$(TOP):$(PATH)
+export PATH:=$(TOP):$(PATH)
 
 # magic debhelper rule
 %:

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