[Python-modules-commits] [pysvn] 08/12: merge patched into master

[Josué Ortega]

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

josue pushed a commit to branch master
in repository pysvn.

commit e5d43dcf7c2dcb7f93c83fca48571ce2c4ffdf81
Merge: a359043 428197a
Author: Josue Ortega <josue at debian.org>
Date:   Sun Oct 9 21:43:24 2016 -0600

    merge patched into master

 Source/setup_configure.py                          |  8 +++++++-
 debian/.git-dpm                                    |  4 ++--
 .../patches/0001-fix-multiple-arch-support.patch   | 24 ++++++++++++++--------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index 6b675c4,0000000..09ca6c1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 16d38a1cb2c2567b13bb92850c636e7d5a9cd903
- 16d38a1cb2c2567b13bb92850c636e7d5a9cd903
++428197ae046f23c800d3c677e9f9f857a75d3db1
++428197ae046f23c800d3c677e9f9f857a75d3db1
 +fdbb6c2ae0eaa851c9dbee243b205588a2ec1fa0
 +fdbb6c2ae0eaa851c9dbee243b205588a2ec1fa0
 +pysvn_1.9.4.orig.tar.gz
 +3403eef6cc38dc9cb2dc5795e488bcfe458644d5
 +405817
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-multiple-arch-support.patch
index a28f937,0000000..399d531
mode 100644,000000..100644
--- a/debian/patches/0001-fix-multiple-arch-support.patch
+++ b/debian/patches/0001-fix-multiple-arch-support.patch
@@@ -1,85 -1,0 +1,91 @@@
- From 16d38a1cb2c2567b13bb92850c636e7d5a9cd903 Mon Sep 17 00:00:00 2001
++From 428197ae046f23c800d3c677e9f9f857a75d3db1 Mon Sep 17 00:00:00 2001
 +From: Josue Ortega <josue at debian.org>
 +Date: Sun, 9 Oct 2016 21:16:25 -0600
 +Subject: =?UTF-8?q?fix-multiple-arch-support=0AFixes=20issue=20building=20?=
 + =?UTF-8?q?the=20package=20on=20archs=20that=20are=20not=20amd64?=
 +
 +---
-  Source/setup_configure.py | 34 ++++++++++++++++++++++++++++++++--
-  1 file changed, 32 insertions(+), 2 deletions(-)
++ Source/setup_configure.py | 40 ++++++++++++++++++++++++++++++++++++++--
++ 1 file changed, 38 insertions(+), 2 deletions(-)
 +
 +diff --git a/Source/setup_configure.py b/Source/setup_configure.py
- index 27aaf7c..f99f64f 100644
++index 27aaf7c..186d16b 100644
 +--- a/Source/setup_configure.py
 ++++ b/Source/setup_configure.py
 +@@ -14,6 +14,7 @@
 + #
 + import sys
 + import os
 ++import subprocess
 + import distutils
 + import distutils.sysconfig
 + import distutils.util
- @@ -21,6 +22,25 @@ import distutils.util
++@@ -21,6 +22,31 @@ import distutils.util
 + import xml.dom.minidom
 + import xml.sax
 + 
 ++def get_debian_lib_directory():
 ++    debian_lib_path = "/usr/lib/ %(arch_name)s"
 ++    _process = subprocess.Popen(["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
 ++                               stdout=subprocess.PIPE)
 ++    _stdout, _stderr = _process.communicate()
 ++
 ++    if _stderr is not None:
 ++        return None
 ++
- +    _arch = _stdout.replace("\n", "")
+++    _arch = None
+++
+++    if type(_stdout) == type(str()):
+++        _arch = _stdout.replace("\n", "")
+++    elif type(_stdout) == type(bytes()):
+++        _arch = _stdout.decode("utf-8").replace("\n", "")
+++
 ++    _debian_lib_path = debian_lib_path % {
 ++        "arch_name" : _arch
 ++    }
 ++
 ++    print('Debian lib directory %s\n', _debian_lib_path)
 ++
 ++    return _debian_lib_path
 ++
 ++
 + class SetupError(Exception):
 +     pass
 + 
- @@ -1184,6 +1204,8 @@ class UnixCompilerGCC(CompilerGCC):
++@@ -1184,6 +1210,8 @@ class UnixCompilerGCC(CompilerGCC):
 +     def __init__( self, setup ):
 +         CompilerGCC.__init__( self, setup )
 + 
 ++        _debian_arch = get_debian_lib_directory()
 ++
 +         self._find_paths_pycxx_dir = [
 +                         distutils.sysconfig.get_python_inc(), # typical Linux
 +                         '/usr/include'
- @@ -1210,8 +1232,13 @@ class UnixCompilerGCC(CompilerGCC):
++@@ -1210,8 +1238,13 @@ class UnixCompilerGCC(CompilerGCC):
 +                         '/usr/local/lib64',                     # typical 64bit Linux
 +                         '/usr/local/lib',                       # typical *BSD
 +                         '/usr/pkg/lib',                         # netbsd
 +-                        '/usr/lib/x86_64-linux-gnu',            # debian/unbuntu
 ++                        # '/usr/lib/x86_64-linux-gnu',          # debian/unbuntu
 +                         ]
 ++
 ++        if _debian_arch is not None \
 ++           and _debian_arch not in self._find_paths_svn_lib:
 ++            self._find_paths_svn_lib.append(_debian_arch)
 ++
 +         self._find_paths_apr_inc = [
 +                         '/usr/include/apr-1',                   # typical Linux
 +                         '/usr/include/apr-1.0',                 # typical Linux
- @@ -1230,8 +1257,11 @@ class UnixCompilerGCC(CompilerGCC):
++@@ -1230,8 +1263,11 @@ class UnixCompilerGCC(CompilerGCC):
 +                         '/usr/local/lib',                       # typical *BSD
 +                         '/usr/local/apr/lib',                   # Mac OS X www.metissian.com
 +                         '/usr/pkg/lib',                         # netbsd
 +-                        '/usr/lib/x86_64-linux-gnu',            # debian/unbuntu
 ++                        # '/usr/lib/x86_64-linux-gnu',          # debian/unbuntu
 +                         ]
 ++        if _debian_arch is not None \
 ++           and _debian_arch not in self._find_paths_apr_lib:
 ++            self._find_paths_apr_lib.append(_debian_arch)
 + 
 +         self._completeInit()
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pysvn.git