[Python-modules-commits] [pysvn] 02/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 4218edbabd040f567b26aa4cbd182a0ba9b67d68
Merge: 6396140 308ecf9
Author: Josue Ortega <josue at debian.org>
Date:   Sun Oct 9 21:18:08 2016 -0600

    merge patched into master

 Source/setup_configure.py                          | 34 ++++++++-
 debian/.git-dpm                                    |  4 +-
 ...atch-Name-fix-multiple-arch-support.patch.patch | 85 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 120 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index e3e74fb,0000000..5a0fe92
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
- fdbb6c2ae0eaa851c9dbee243b205588a2ec1fa0
- fdbb6c2ae0eaa851c9dbee243b205588a2ec1fa0
++308ecf97edc2b2227656ff0967332e3bea7dc573
++308ecf97edc2b2227656ff0967332e3bea7dc573
 +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-Patch-Name-fix-multiple-arch-support.patch.patch
index 0000000,0000000..c3ed8ef
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Patch-Name-fix-multiple-arch-support.patch.patch
@@@ -1,0 -1,0 +1,85 @@@
++From 308ecf97edc2b2227656ff0967332e3bea7dc573 Mon Sep 17 00:00:00 2001
++From: Josue Ortega <josue at debian.org>
++Date: Sun, 9 Oct 2016 21:16:25 -0600
++Subject: Patch-Name: fix-multiple-arch-support.patch
++
++Fixes issue building the package on archs that are not amd64
++---
++ Source/setup_configure.py | 34 ++++++++++++++++++++++++++++++++--
++ 1 file changed, 32 insertions(+), 2 deletions(-)
++
++diff --git a/Source/setup_configure.py b/Source/setup_configure.py
++index 27aaf7c..f99f64f 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
++ 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", "")
+++    _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):
++     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):
++                         '/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):
++                         '/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()
++ 
diff --cc debian/patches/series
index 0000000,0000000..a85baf4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Patch-Name-fix-multiple-arch-support.patch.patch

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