tags 937552 +pending thanks svn-workbench has now been kicked out of testing, so I have decided to go ahead with NMUing pysvn. During prep for the NMU I noticed the clean target was broken, so I fixed that too.
debdiff is attatched, NMU is in delayed/5
diff -Nru pysvn-1.9.9/debian/changelog pysvn-1.9.9/debian/changelog --- pysvn-1.9.9/debian/changelog 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/changelog 2019-12-28 11:03:00.000000000 +0000 @@ -1,3 +1,12 @@ +pysvn (1.9.9-2.1) unstable; urgency=medium + + * Non-maintainer upload + * Fix clean target + [Gianfranco Costamagna] + * Drop python2 package (Closes: #937552) + + -- Peter Michael Green <plugw...@debian.org> Sat, 28 Dec 2019 11:03:00 +0000 + pysvn (1.9.9-2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru pysvn-1.9.9/debian/control pysvn-1.9.9/debian/control --- pysvn-1.9.9/debian/control 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/control 2019-12-28 11:02:36.000000000 +0000 @@ -10,10 +10,6 @@ libaprutil1-dev, libneon27-gnutls-dev, libsvn-dev (>= 1.8.10), - python-all-dbg, - python-all-dev (>= 2.7.8), - python-cxx-dev (>= 7.0.1), - python-setuptools, python3-all (>= 3.4.2), python3-all-dev (>= 3.4.2), python3-setuptools (>= 5.5.1), @@ -26,15 +22,6 @@ Vcs-Git: https://salsa.debian.org/python-team/modules/pysvn.git Vcs-Browser: https://salsa.debian.org/python-team/modules/pysvn -Package: python-svn -Architecture: any -Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Provides: python-pysvn -Description: A(nother) Python interface to Subversion - The pysvn module is a Python interface to the Subversion version - control system. This API exposes client interfaces for managing a - working copy, querying a repository, and synchronizing the two. - Package: python3-svn Architecture: any Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} diff -Nru pysvn-1.9.9/debian/python-svn.dirs pysvn-1.9.9/debian/python-svn.dirs --- pysvn-1.9.9/debian/python-svn.dirs 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/python-svn.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python2.7/dist-packages/pysvn diff -Nru pysvn-1.9.9/debian/python-svn.doc-base pysvn-1.9.9/debian/python-svn.doc-base --- pysvn-1.9.9/debian/python-svn.doc-base 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/python-svn.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Document: pysvn -Title: pysvn - Python interface to Subversion -Author: Barry A. Scott -Abstract: This document contains the pysvn Programmer's Guide (covering the - use of pysvn in a tutorial style with lots of examples) and the pysvn - Programmer's Reference (detailed descriptions of all the classes, functions - and variables of pysvn). -Section: Programming/Python - -Format: HTML -Index: /usr/share/doc/python-svn/pysvn.html -Files: /usr/share/doc/python-svn/*.html diff -Nru pysvn-1.9.9/debian/python-svn.docs pysvn-1.9.9/debian/python-svn.docs --- pysvn-1.9.9/debian/python-svn.docs 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/python-svn.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Docs/*.html -Docs/*.js diff -Nru pysvn-1.9.9/debian/python-svn.examples pysvn-1.9.9/debian/python-svn.examples --- pysvn-1.9.9/debian/python-svn.examples 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/python-svn.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Examples/* diff -Nru pysvn-1.9.9/debian/python-svn.install pysvn-1.9.9/debian/python-svn.install --- pysvn-1.9.9/debian/python-svn.install 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/python-svn.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Source/pysvn/python2/__init__.py usr/lib/python2.7/dist-packages/pysvn/ -Source/pysvn/python2/_pysvn_2_7.so usr/lib/python2.7/dist-packages/pysvn/ diff -Nru pysvn-1.9.9/debian/rules pysvn-1.9.9/debian/rules --- pysvn-1.9.9/debian/rules 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/rules 2019-12-28 11:03:00.000000000 +0000 @@ -8,27 +8,13 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -PYVERS := $(shell pyversions -vr debian/control) PY3VERS := $(shell py3versions -vr debian/control) APR_INC = $(strip $(shell apr-config --includes | sed 's/-I//')) - -CONFIG_OPTS = --pycxx-src-dir=/usr/share/python${PYVERS}/CXX \ - --pycxx-dir=/usr/include/python${PYVERS} \ - --svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - --apr-inc-dir=$(APR_INC) \ - --apu-inc-dir=$(APR_INC) \ - --apr-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - --norpath \ - --platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) - - %: - dh $@ --with=python2,python3 --buildsystem=pybuild + dh $@ --with=python3 --buildsystem=pybuild override_dh_auto_configure: - cd $(CURDIR)/Source; python setup.py configure $(CONFIG_OPTS) - mv $(CURDIR)/Source/Makefile $(CURDIR)/Source/MakefilePy2 set -e && for i in $(PY3VERS); do \ cd $(CURDIR)/Source; python$$i setup.py configure \ --pycxx-src-dir=/usr/share/python$$i/CXX \ @@ -45,14 +31,6 @@ override_dh_auto_build: - mkdir $(CURDIR)/Source/pysvn/python2 - mv $(CURDIR)/Source/MakefilePy2 $(CURDIR)/Source/Makefile - $(MAKE) -C $(CURDIR)/Source - - mv $(CURDIR)/Source/pysvn/__init__.py $(CURDIR)/Source/pysvn/python2/ - mv $(CURDIR)/Source/pysvn/_pysvn_2_*.so $(CURDIR)/Source/pysvn/python2/ - $(MAKE) clean -C $(CURDIR)/Source - set -e && for i in $(PY3VERS); do \ mkdir -p $(CURDIR)/Source/pysvn/python3/python$$i/dist-packages/pysvn ; \ mv $(CURDIR)/Source/MakefilePy$$i $(CURDIR)/Source/Makefile ; \ @@ -69,8 +47,6 @@ override_dh_auto_clean: dh_auto_clean - rm -rf $(CURDIR)/Source/pysvn/python2 rm -rf $(CURDIR)/Source/pysvn/python3 - rm -rf $(CURDIR)/debian/python-pysvn - rm -rf $(CURDIR)/debian/python-pysvn-dbg rm -rf $(CURDIR)/debian/python3-pysvn + rm -rf pysvn.egg-info diff -Nru pysvn-1.9.9/debian/tests/control pysvn-1.9.9/debian/tests/control --- pysvn-1.9.9/debian/tests/control 2019-10-31 01:10:08.000000000 +0000 +++ pysvn-1.9.9/debian/tests/control 2019-12-28 11:02:36.000000000 +0000 @@ -1,3 +1 @@ -Test-Command: python2 -c "import pysvn" - Test-Command: python3 -c "import pysvn"
