Control: tags 937622 + patch

Dear maintainer,

I've prepared an NMU for python-bsddb3 (versioned as 6.2.7-1.1). The diff
is attached to this message.

Regards.

diff -Nru python-bsddb3-6.2.7/debian/changelog python-bsddb3-6.2.7/debian/changelog
--- python-bsddb3-6.2.7/debian/changelog	2020-02-18 11:12:56.000000000 -0500
+++ python-bsddb3-6.2.7/debian/changelog	2020-03-16 15:06:57.000000000 -0400
@@ -1,3 +1,10 @@
+python-bsddb3 (6.2.7-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #937622
+
+ -- Sandro Tosi <mo...@debian.org>  Mon, 16 Mar 2020 15:06:57 -0400
+
 python-bsddb3 (6.2.7-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru python-bsddb3-6.2.7/debian/control python-bsddb3-6.2.7/debian/control
--- python-bsddb3-6.2.7/debian/control	2020-02-18 11:12:56.000000000 -0500
+++ python-bsddb3-6.2.7/debian/control	2020-03-16 15:05:02.000000000 -0400
@@ -5,45 +5,12 @@
 Build-Depends: debhelper (>= 9),
   dh-python,
   libdb5.3-dev,
-  python2.7-dev (>= 2.7.8-4),
-  python-all-dev (>= 2.6.6-1~),
-  python-all-dbg,
   python3-all-dev (>= 3.2.3-7~),
   python3-all-dbg
 Build-Depends-Indep: python3-sphinx
 Standards-Version: 4.5.0
 Homepage: http://pypi.python.org/pypi/bsddb3/
 
-Package: python-bsddb3
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
-Suggests: python-bsddb3-dbg
-Provides: ${python:Provides}
-Description: Python interface for Berkeley DB
- This module provides a nearly complete wrapping of the Oracle/Sleepycat C API
- for the Database Environment, Database, Cursor, Sequence and Transaction
- objects, and each of these is exposed as a Python Type in the bsddb3.db
- module.  The database objects can use various access methods: btree, hash,
- recno and queue.  Complete support of Berkeley DB distributed transactions.
- Complete support for Berkeley DB Replication Manager. Complete support for
- Berkeley DB Base Replication. Support for RPC.
-
-Package: python-bsddb3-dbg
-Architecture: any
-Section: debug
-Depends: python-bsddb3 (= ${binary:Version}), python2-dbg, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-Description: Python interface for Berkeley DB (debug extension)
- This module provides a nearly complete wrapping of the Oracle/Sleepycat C API
- for the Database Environment, Database, Cursor, Sequence and Transaction
- objects, and each of these is exposed as a Python Type in the bsddb3.db
- module.  The database objects can use various access methods: btree, hash,
- recno and queue.  Complete support of Berkeley DB distributed transactions.
- Complete support for Berkeley DB Replication Manager. Complete support for
- Berkeley DB Base Replication. Support for RPC.
- .
- This package contains the extension built for the python debug interpreter.
-
 Package: python3-bsddb3
 Architecture: any
 Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
diff -Nru python-bsddb3-6.2.7/debian/rules python-bsddb3-6.2.7/debian/rules
--- python-bsddb3-6.2.7/debian/rules	2019-01-21 17:25:17.000000000 -0500
+++ python-bsddb3-6.2.7/debian/rules	2020-03-16 15:06:52.000000000 -0400
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYVERS  := $(shell pyversions -vs)
-PYVER   := $(shell pyversions -vd)
 PY3VERS   := $(shell py3versions -vs)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -17,19 +15,7 @@
 build: build-stamp
 build-arch: build-stamp
 build-indep: build-stamp
-build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=dbg-build-python%) $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%)
-	touch $@
-
-build-python%:
-	BERKELEYDB_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	BERKELEYDB_INCDIR=/usr/include \
-	python$* setup2.py build $(build_args)
-	touch $@
-
-dbg-build-python%:
-	BERKELEYDB_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	BERKELEYDB_INCDIR=/usr/include \
-	python$*-dbg setup2.py build $(build_args)
+build-stamp: $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%)
 	touch $@
 
 build3-python%:
@@ -57,7 +43,7 @@
 	find -name '*.py[co]' | xargs -r rm -f
 	dh_clean
 
-install: build install-prereq $(PYVERS:%=install-python%) $(PYVERS:%=dbg-install-python%) $(PY3VERS:%=install3-python%) $(PY3VERS:%=dbg-install3-python%)
+install: build install-prereq $(PY3VERS:%=install3-python%) $(PY3VERS:%=dbg-install3-python%)
 	find debian -name '*.py[co]' | xargs -r rm -f
 
 install-prereq:
@@ -65,29 +51,6 @@
 	dh_testroot
 	dh_prep
 
-install-python%:
-	mkdir -p $(d)/usr/bin
-#	mkdir -p $(d)/usr/lib/python$*/site-packages
-	BERKELEYDB_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	BERKELEYDB_INCDIR=/usr/include \
-	python$* setup2.py install \
-		--root=$(CURDIR)/$(d) --install-layout=deb $(build_args)
-	rm -rf $(d)/usr/lib/python$*/*-packages/bsddb3/tests
-
-dbg-install-python%:
-	mkdir -p $(d)/usr/bin
-#	mkdir -p $(d)-dbg/usr/lib/python$*/site-packages
-	BERKELEYDB_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	BERKELEYDB_INCDIR=/usr/include \
-	python$*-dbg setup2.py install \
-		--root=$(CURDIR)/$(d)-dbg --install-layout=deb $(build_args)
-	find debian/python-*-dbg/usr/lib ! -type d ! -name '*.so' \
-		| xargs -r rm -f
-	find debian/python-*-dbg -depth -empty -exec rmdir {} \;
-	rm -rf $(d)-dbg/usr/include/python$*
-	mkdir -p $(d)-dbg/usr/include/python$*_d
-	ln -sf ../python$*/bsddb3 $(d)-dbg/usr/include/python$*_d/bsddb3
-
 install3-python%:
 	BERKELEYDB_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	BERKELEYDB_INCDIR=/usr/include \
@@ -137,13 +100,9 @@
 	dh_testroot
 	dh_installdocs -a README.txt TODO.txt
 	dh_installchangelogs -a ChangeLog
-	dh_python2 -a
 	dh_python3 -a
 	dh_link -a
-	dh_strip -p$(p) --dbg-package=$(p)-dbg
 	dh_strip -p$(p3) --dbg-package=$(p3)-dbg
-	rm -rf $(d)-dbg/usr/share/doc/$(p)-dbg
-	ln -s $(p) $(d)-dbg/usr/share/doc/$(p)-dbg
 	rm -rf $(d3)-dbg/usr/share/doc/$(p3)-dbg
 	ln -s $(p3) $(d3)-dbg/usr/share/doc/$(p3)-dbg
 	dh_compress -a

Reply via email to