Commit 59e4e31a authored by Ondřej Nový's avatar Ondřej Nový

Convert git repository from git-dpm to gbp layout

parent f2c87893
......@@ -14,7 +14,6 @@
#
import sys
import os
import subprocess
import distutils
import distutils.sysconfig
import distutils.util
......@@ -22,31 +21,6 @@ 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 = 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
......@@ -1213,8 +1187,6 @@ 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'
......@@ -1241,13 +1213,8 @@ 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
......@@ -1266,11 +1233,8 @@ 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()
......
# see git-dpm(1) from git-dpm package
5f01555b272f02d0f1145ebb6baaad6fec212f3f
5f01555b272f02d0f1145ebb6baaad6fec212f3f
7aa7b6ac2c5c5d6b8e21a6975ca3dce860ab1559
7aa7b6ac2c5c5d6b8e21a6975ca3dce860ab1559
pysvn_1.9.6.orig.tar.gz
88b072bdd4b2ce0d32e83fce29c631b2b798a483
515394
debianTag="debian/%e%v"
patchedTag="patched/%e%v"
upstreamTag="upstream/%e%u"
pysvn (1.9.6-2) UNRELEASED; urgency=medium
* Convert git repository from git-dpm to gbp layout
-- Ondřej Nový <onovy@debian.org> Wed, 08 Aug 2018 09:16:56 +0200
pysvn (1.9.6-1) unstable; urgency=medium
[ Ondřej Nový ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment