diff -Nru subvertpy-0.11.0~git20191228+2423bf1/debian/changelog subvertpy-0.11.0~git20191228+2423bf1/debian/changelog --- subvertpy-0.11.0~git20191228+2423bf1/debian/changelog 2020-02-25 12:30:05.000000000 +0000 +++ subvertpy-0.11.0~git20191228+2423bf1/debian/changelog 2020-03-27 11:34:30.000000000 +0000 @@ -1,3 +1,30 @@ +subvertpy (0.11.0~git20191228+2423bf1-2ubuntu1) focal; urgency=medium + + * Merge with Debian; remaining changes: + * Merge from Debian unstable. Remaining changes: + - Fix autopkgtest to run python2 tests with python2 binary. + - Run autopkgtests for python3 too. + - Use python2 instead of python also in control file + + -- Matthias Klose Fri, 27 Mar 2020 12:34:30 +0100 + +subvertpy (0.11.0~git20191228+2423bf1-2) unstable; urgency=medium + + * Team upload. + * debian/gbp.conf: Remove incorrect debian-branch variable + which was set to "unstable" but should actually "master" now. + * Bump Standards-Version to 4.5.0 (no change). + * Add "Rules-Requires-Root: no" to debian/control. + * Remove workaround on installing our own python3-cachecontrol + as it is now available and the latest pydoctor does depend on it. + * Change build-dependency on python-pydoctor to Python-3-based pydoctor + * Add build-dependency on python3-docutils. + to parallel the existing dependency on Python-2-based python-docutils + * debian/rules: Replace override_* with execute_after_* targets + where appropriate. + + -- Anthony Fok Thu, 05 Mar 2020 19:09:25 -0700 + subvertpy (0.11.0~git20191228+2423bf1-1ubuntu2) focal; urgency=medium * Use python2 instead of python also in control file @@ -8,7 +35,7 @@ * Merge from Debian unstable. Remaining changes: - Fix autopkgtest to run python2 tests with python2 binary. - - Run autopkgtests for python3 too. + - Run autopkgtests for python3 too. * Dropped changes, included upstream: - Fix the ml_flags on wc.WorkingCopy.add_repos_file to fix build with Python 3.8. @@ -424,4 +451,3 @@ * Initial release. (Closes: #511813) -- Jelmer Vernooij Tue, 13 Jan 2009 17:42:24 +0100 - diff -Nru subvertpy-0.11.0~git20191228+2423bf1/debian/control subvertpy-0.11.0~git20191228+2423bf1/debian/control --- subvertpy-0.11.0~git20191228+2423bf1/debian/control 2020-02-25 12:30:04.000000000 +0000 +++ subvertpy-0.11.0~git20191228+2423bf1/debian/control 2020-03-27 11:34:30.000000000 +0000 @@ -5,19 +5,18 @@ XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Jelmer Vernooij Homepage: https://www.jelmer.uk/subvertpy +Rules-Requires-Root: no Build-Depends: dh-python, libsvn-dev, - python2 (>= 2.6.6-3), # python-all-dbg (>= 2.6.6-3), python-all-dev (>= 2.6.6-3), python3-all-dev, # python3-all-dbg, python-docutils, - python-pydoctor (>= 0.5+git20151204), - python3-cachecontrol | python-cachecontrol, - python-lockfile, + python3-docutils, + pydoctor (>> 19.11.0+git20200303.47424e7), debhelper-compat (= 12) -Standards-Version: 4.0.0 +Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/python-team/modules/subvertpy.git Vcs-Browser: https://salsa.debian.org/python-team/modules/subvertpy diff -Nru subvertpy-0.11.0~git20191228+2423bf1/debian/gbp.conf subvertpy-0.11.0~git20191228+2423bf1/debian/gbp.conf --- subvertpy-0.11.0~git20191228+2423bf1/debian/gbp.conf 2020-01-19 15:50:04.000000000 +0000 +++ subvertpy-0.11.0~git20191228+2423bf1/debian/gbp.conf 2020-02-23 14:05:23.000000000 +0000 @@ -1,3 +1,2 @@ [DEFAULT] -debian-branch = unstable upstream-vcs-tag = subvertpy-%(version)s diff -Nru subvertpy-0.11.0~git20191228+2423bf1/debian/rules subvertpy-0.11.0~git20191228+2423bf1/debian/rules --- subvertpy-0.11.0~git20191228+2423bf1/debian/rules 2020-01-19 15:50:04.000000000 +0000 +++ subvertpy-0.11.0~git20191228+2423bf1/debian/rules 2020-03-06 02:09:20.000000000 +0000 @@ -17,26 +17,14 @@ export PYBUILD_NAME=subvertpy export HOME=$(CURDIR)/nonexistent -export PYTHONPATH = debian/fake-python-path - %: CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ LDFLAGS="$(LDFLAGS)" dh $* --with python2,python3 --buildsystem=pybuild -override_dh_auto_configure: - mkdir -p debian/fake-python-path - [ ! -d /usr/lib/python2.7/dist-packages/cachecontrol ] && \ - [ -d /usr/lib/python3/dist-packages/cachecontrol ] && \ - ln -s /usr/lib/python3/dist-packages/cachecontrol debian/fake-python-path/cachecontrol || \ - true - dh_auto_configure - -override_dh_auto_build: - dh_auto_build +execute_after_dh_auto_build: PYTHONHASHSEED=0 $(MAKE) pydoctor -override_dh_auto_install: - dh_auto_install +execute_after_dh_auto_install: mkdir -p debian/python3-subvertpy/usr/share/doc/python3-subvertpy \ debian/python-subvertpy/usr/share/doc/python-subvertpy cp -a apidocs debian/python-subvertpy/usr/share/doc/python-subvertpy/api