Commit 1dbf8e36 authored by Mathieu Parent's avatar Mathieu Parent

Merge branch 'master' into 'master'

Add py3 support back

See merge request samba-team/talloc!1
parents c511a1fb 521a9da2
......@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 11),
dh-exec,
dh-python,
libpopt-dev,
python-dev (>= 2.6.6-3)
python-dev (>= 2.6.6-3),
python3-dev,
Standards-Version: 4.1.3
Vcs-Browser: https://salsa.debian.org/samba-team/talloc
Vcs-Git: https://salsa.debian.org/samba-team/talloc.git
......@@ -56,3 +57,25 @@ Description: talloc Python bindings - development files
reference counting to determine when memory should be freed.
.
This package contains the development files for the Python bindings.
Package: python3-talloc
Pre-Depends: ${misc:Pre-Depends}
Architecture: any
Section: python
Provides: ${python3:Provides}
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
Description: hierarchical pool based memory allocator - Python3 bindings
A hierarchical pool based memory allocator with destructors. It uses
reference counting to determine when memory should be freed.
.
This package contains the Python3 bindings.
Package: python3-talloc-dev
Architecture: any
Section: libdevel
Depends: python3-talloc (= ${binary:Version}), ${misc:Depends}, pkg-config
Description: talloc Python3 bindings - development files
A hierarchical pool based memory allocator with destructors. It uses
reference counting to determine when memory should be freed.
.
This package contains the development files for the Python3 bindings.
pytalloc-util-name.diff
#! /usr/bin/dh-exec
usr/include/pytalloc.h ${DEB_PY3_INCDIR}
usr/lib/*/pkgconfig/pytalloc-util.cpython-*.pc
usr/lib/*/libpytalloc-util.cpython*.so
python-talloc-dev binary: wrong-section-according-to-package-name python-talloc-dev => python
usr/lib/python3/dist-packages/talloc.cpython*.so
usr/lib/*/libpytalloc-util.cpython*.so.*
python3-talloc binary: package-name-doesnt-match-sonames
libpytalloc-util.cpython-36m-x86-64-linux-gnu.so.2 python3-talloc #MINVER#
PYTALLOC_UTIL.CPYTHON_36M_X86_64_LINUX_GNU_2.1.11@PYTALLOC_UTIL.CPYTHON_36M_X86_64_LINUX_GNU_2.1.11 2.1.11
PYTALLOC_UTIL.PY3_2.1.10@PYTALLOC_UTIL.PY3_2.1.10 2.1.11
PYTALLOC_UTIL.PY3_2.1.11@PYTALLOC_UTIL.PY3_2.1.11 2.1.11
PYTALLOC_UTIL.PY3_2.1.5@PYTALLOC_UTIL.PY3_2.1.5 2.1.11
PYTALLOC_UTIL.PY3_2.1.6@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
PYTALLOC_UTIL.PY3_2.1.7@PYTALLOC_UTIL.PY3_2.1.7 2.1.11
PYTALLOC_UTIL.PY3_2.1.8@PYTALLOC_UTIL.PY3_2.1.8 2.1.11
PYTALLOC_UTIL.PY3_2.1.9@PYTALLOC_UTIL.PY3_2.1.9 2.1.11
_pytalloc_check_type@PYTALLOC_UTIL.PY3_2.1.9 2.1.11
_pytalloc_get_mem_ctx@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
_pytalloc_get_ptr@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
_pytalloc_get_type@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
pytalloc_BaseObject_PyType_Ready@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
pytalloc_BaseObject_check@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
pytalloc_BaseObject_size@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
pytalloc_Check@PYTALLOC_UTIL.PY3_2.1.5 2.1.11
pytalloc_GenericObject_reference_ex@PYTALLOC_UTIL.PY3_2.1.9 2.1.11
pytalloc_GenericObject_steal_ex@PYTALLOC_UTIL.PY3_2.1.9 2.1.11
pytalloc_GetBaseObjectType@PYTALLOC_UTIL.PY3_2.1.6 2.1.11
pytalloc_GetObjectType@PYTALLOC_UTIL.PY3_2.1.5 2.1.11
pytalloc_reference_ex@PYTALLOC_UTIL.PY3_2.1.5 2.1.11
pytalloc_steal@PYTALLOC_UTIL.PY3_2.1.5 2.1.11
pytalloc_steal_ex@PYTALLOC_UTIL.PY3_2.1.5 2.1.11
......@@ -17,12 +17,13 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
conf_args = --prefix=/usr --disable-rpath-install --disable-rpath --bundled-libraries=NONE
conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
conf_args += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
conf_args += --extra-python=python3
conf_args += -v
export PYTHON="$(shell which `pyversions -d`)"
%:
dh $* --with python2
dh $* --with python2,python3
override_dh_python2:
dh_python2 --no-guessing-versions
......@@ -40,6 +41,7 @@ endif
override_dh_install:
DEB_PY2_INCDIR=$(shell python-config --includes | sed 's,^-I\([^ ]*\).*,\1,') \
DEB_PY3_INCDIR=$(shell python3-config --includes | sed 's,^-I\([^ ]*\).*,\1,') \
dh_install --list-missing
get-packaged-orig-source:
......@@ -68,4 +70,4 @@ override_dh_strip:
override_dh_makeshlibs:
dh_makeshlibs -plibtalloc2 -- -c4
dh_makeshlibs -ppython-talloc -Xtalloc. -- -c3
dh_makeshlibs -ppython-talloc -ppython3-talloc -Xtalloc. -- -c3
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