Control: tags 936181 + patch
Control: tags 936181 + pending

Dear maintainer,

I've prepared an NMU for backup2swift (versioned as 0.8-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru backup2swift-0.8/debian/changelog backup2swift-0.8/debian/changelog
--- backup2swift-0.8/debian/changelog	2013-08-15 09:27:31.000000000 -0400
+++ backup2swift-0.8/debian/changelog	2019-10-20 17:00:28.000000000 -0400
@@ -1,3 +1,10 @@
+backup2swift (0.8-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #936181
+
+ -- Sandro Tosi <mo...@debian.org>  Sun, 20 Oct 2019 17:00:28 -0400
+
 backup2swift (0.8-1) unstable; urgency=low
 
   * Initial release (Closes: #717927)
diff -Nru backup2swift-0.8/debian/control backup2swift-0.8/debian/control
--- backup2swift-0.8/debian/control	2013-08-16 10:35:06.000000000 -0400
+++ backup2swift-0.8/debian/control	2019-10-20 17:00:28.000000000 -0400
@@ -2,24 +2,12 @@
 Section: python
 Priority: optional
 Maintainer: Kouhei Maeda <mkou...@palmtb.net>
-Build-Depends: debhelper (>= 8.0.0), python-all, python-setuptools, python-pytest, pep8, python-mock, python-swiftsc (>= 0.5), python-argparse, python3-all, python3-setuptools, python3-pytest, python3-mock, python3-swiftsc (>= 0.5)
+Build-Depends: debhelper (>= 8.0.0), dh-python, pep8, python3-all, python3-setuptools, python3-pytest, python3-mock, python3-swiftsc (>= 0.5)
 Standards-Version: 3.9.4
-X-Python-Version: >= 2.6, >= 3.2
 Homepage: https://github.com/mkouhei/backup2swift
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/backup2swift.git
 Vcs-Git: git://anonscm.debian.org/openstack/backup2swift.git
 
-Package: python-backup2swift
-Architecture: all
-Provides: ${python:Provides}
-Depends: ${python:Depends}, ${misc:Depends}, python-swiftsc (>= 0.5), python-argparse
-Description: backup data to OpenStack Swift - python 2.x
- This utility is used to backup data to OpenStack Swift. It provides a command
- interface and backup rotation. It depends on a simple swift client library
- called swiftsc.
- .
- This package provides the python 2 module.
-
 Package: python3-backup2swift
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3-swiftsc (>= 0.5)
diff -Nru backup2swift-0.8/debian/python-backup2swift.manpages backup2swift-0.8/debian/python-backup2swift.manpages
--- backup2swift-0.8/debian/python-backup2swift.manpages	2013-08-15 09:27:31.000000000 -0400
+++ backup2swift-0.8/debian/python-backup2swift.manpages	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-docs/man/bu2sw.1
diff -Nru backup2swift-0.8/debian/rules backup2swift-0.8/debian/rules
--- backup2swift-0.8/debian/rules	2013-08-15 09:27:31.000000000 -0400
+++ backup2swift-0.8/debian/rules	2019-10-20 17:00:28.000000000 -0400
@@ -3,23 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# skip tests for now, most likely they never ran on py3k
+export PYBUILD_DISABLE=test
+
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_auto_build:
-	for py in $(shell pyversions -vr); do \
-		python$$ setup.py build --build-base=_build$$py; \
-	done
-
-override_dh_auto_test:
-	set -e; \
-	for py in $(shell pyversions -vr); do \
-		if [ "$$py" < "3.0" ]; then \
-			py.test-$$py -v $(CURDIR)/_build/lib.$(shell python -c 'import distutils.util as d; print d.get_platform()')-$$py; \
-		else \
-			py.test-3 -v $(CURDIR)/_build/lib ;\
-		fi ;\
-	done
 
 override_dh_python3:
 	dh_python3 && \
@@ -32,19 +21,9 @@
 	mv -f $(CURDIR)/debian/python3-backup2swift/usr/share/man/man1/bu2sw.1 $(CURDIR)/debian/python3-backup2swift/usr/share/man/man1/bu2sw3.1
 
 override_dh_auto_install:
-	python setup.py install --no-compile -O0 --install-layout=deb \
-		--root $(CURDIR)/debian/python-backup2swift && \
-	python3 setup.py install --no-compile -O0 --install-layout=deb \
-		--root $(CURDIR)/debian/python3-backup2swift && \
-	rm -rf $(CURDIR)/debian/python-backup2swift/usr/share/pyshared/backup2swift_tests
-	rm -rf $(CURDIR)/debian/python-backup2swift/usr/lib/python2.6/dist-packages/backup2swift_tests
-	rm -rf $(CURDIR)/debian/python-backup2swift/usr/lib/python2.7/dist-packages/backup2swift_tests
-	rm -rf $(CURDIR)/debian/python3-backup2swift/usr/lib/python3/dist-packages/backup2swift_tests
+	dh_auto_install
+	rm -rf $(CURDIR)/debian/python3-backup2swift/usr/lib/python3*/dist-packages/backup2swift_tests/
 
 override_dh_auto_clean:
 	dh_clean
-	for py in $(shell pyversions -vr); do \
-		python$$py setup.py clean --build-temp=_build && \
-		python$$py setup.py clean --build-temp=_build$$py; \
-	done
-	rm -rf $(CURDIR)/_build
\ No newline at end of file
+	rm -rf $(CURDIR)/_build

Reply via email to