Package: src:tdb
Version: 1.3.8-1
Tags: patch

build tdb Python3 bindings.

  * Build python3 bindings.
  * Update build dependencies.
 
diff -Nru tdb-1.3.8/debian/compat tdb-1.3.8/debian/compat
--- tdb-1.3.8/debian/compat	2015-11-08 22:23:12.000000000 +0100
+++ tdb-1.3.8/debian/compat	2016-02-18 18:05:34.000000000 +0100
@@ -1 +1 @@
-8
+9
diff -Nru tdb-1.3.8/debian/control tdb-1.3.8/debian/control
--- tdb-1.3.8/debian/control	2015-11-08 22:23:12.000000000 +0100
+++ tdb-1.3.8/debian/control	2016-02-18 18:05:27.000000000 +0100
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <[email protected]>
 Uploaders: Jelmer Vernooij <[email protected]>
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: debhelper (>= 9),
                dh-python,
                docbook-xml,
                docbook-xsl,
-               python-all-dbg (>= 2.6.6-3),
-               python-all-dev (>= 2.6.6-3),
+               python-dev (>= 2.6.6-3),
+               python3-dev,
                xsltproc
 Homepage: http://tdb.samba.org/
 Standards-Version: 3.9.6
@@ -98,3 +98,35 @@
  appropriate locking and transactions.
  .
  This package contains the Python debug extension.
+
+Package: python3-tdb
+Section: python
+Architecture: linux-any kfreebsd-any
+Depends: libtdb1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Provides: ${python3:Provides}
+Description: Python3 bindings for TDB
+ This is a simple database API. It is modelled after the structure
+ of GDBM. TDB features, unlike GDBM, multiple writers support with
+ appropriate locking and transactions.
+ .
+ This package contains the Python3 bindings.
+
+Package: python3-tdb-dbg
+Section: debug
+Architecture: linux-any kfreebsd-any
+Priority: extra
+Depends: python3-tdb (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Recommends: python3-dbg, libtdb1-dbg
+Provides: ${python3:Provides}
+Description: Python3 bindings for TDB - debug extension
+ This is a simple database API. It is modelled after the structure
+ of GDBM. TDB features, unlike GDBM, multiple writers support with
+ appropriate locking and transactions.
+ .
+ This package contains the Python3 debug extension.
diff -Nru tdb-1.3.8/debian/patches/pass-waf-flags.diff tdb-1.3.8/debian/patches/pass-waf-flags.diff
--- tdb-1.3.8/debian/patches/pass-waf-flags.diff	1970-01-01 01:00:00.000000000 +0100
+++ tdb-1.3.8/debian/patches/pass-waf-flags.diff	2016-02-18 18:35:12.000000000 +0100
@@ -0,0 +1,17 @@
+# Allow to pass flags to waf
+
+--- talloc-2.1.5.orig/Makefile
++++ talloc-2.1.5/Makefile
+@@ -3,10 +3,10 @@
+ WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
+ 
+ all:
+-	$(WAF) build
++	$(WAF) build $(WAFFLAGS)
+ 
+ install:
+-	$(WAF) install
++	$(WAF) install $(WAFFLAGS)
+ 
+ uninstall:
+ 	$(WAF) uninstall
diff -Nru tdb-1.3.8/debian/patches/series tdb-1.3.8/debian/patches/series
--- tdb-1.3.8/debian/patches/series	2015-11-08 22:23:12.000000000 +0100
+++ tdb-1.3.8/debian/patches/series	2016-02-18 18:35:20.000000000 +0100
@@ -1,2 +1,3 @@
 30_tdb_logging_func.diff
 40_test_transaction_expand_non_fatal.diff
+pass-waf-flags.diff
diff -Nru tdb-1.3.8/debian/python3-tdb.install tdb-1.3.8/debian/python3-tdb.install
--- tdb-1.3.8/debian/python3-tdb.install	1970-01-01 01:00:00.000000000 +0100
+++ tdb-1.3.8/debian/python3-tdb.install	2016-02-18 17:58:08.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/python3*
diff -Nru tdb-1.3.8/debian/python-tdb.install tdb-1.3.8/debian/python-tdb.install
--- tdb-1.3.8/debian/python-tdb.install	2015-11-08 22:23:12.000000000 +0100
+++ tdb-1.3.8/debian/python-tdb.install	2016-02-18 17:58:02.000000000 +0100
@@ -1 +1 @@
-usr/lib/python*
+usr/lib/python2*
diff -Nru tdb-1.3.8/debian/rules tdb-1.3.8/debian/rules
--- tdb-1.3.8/debian/rules	2015-11-08 22:23:12.000000000 +0100
+++ tdb-1.3.8/debian/rules	2016-02-18 18:41:12.000000000 +0100
@@ -10,16 +10,19 @@
 
 DESTDIR=$(CURDIR)/debian/tmp
 export PYTHON=$(shell which `pyversions -d`)
-export PYTHON_CONFIG=$(PYTHON)-config
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $* --with python2
+	dh $* --with python2,python3
 
 override_dh_auto_configure:
-	CPPFLAGS="$(CPPFLAGS)" PYTHON="$(PYTHON)" PYTHON_CONFIG="$(PYTHON_CONFIG)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		   ./configure --prefix=/usr --disable-rpath-install --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+	PYTHON="$(PYTHON)" \
+	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		./configure --prefix=/usr --disable-rpath-install \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		--extra-python=python3 \
+		-v
 
 get-packaged-orig-source:
 	./debian/build-orig.sh
@@ -28,7 +31,7 @@
 	dh_python2 --no-guessing-versions
 
 override_dh_auto_build:
-	$(MAKE) all
+	$(MAKE) all WAFFLAGS="-vv"
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -47,6 +50,9 @@
 		  third_party/waf/wafadmin/*.pyc \
 		  third_party/waf/wafadmin/Tools/*.pyc
 
+override_dh_install:
+	dh_install --list-missing
+
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	# Waf should be doing this..
@@ -60,7 +66,8 @@
 override_dh_strip:
 	dh_strip -p libtdb1 --dbg-package=libtdb1-dbg
 	dh_strip -p python-tdb --dbg-package=python-tdb-dbg
+	dh_strip -p python3-tdb --dbg-package=python3-tdb-dbg
 	dh_strip -p tdb-tools
 
 override_dh_makeshlibs:
-	dh_makeshlibs -- -c4
+	dh_makeshlibs -Npython-tdb -Npython3-tdb -- -c4

Reply via email to