diff -Nru python-etcd-0.4.3/debian/changelog python-etcd-0.4.3/debian/changelog --- python-etcd-0.4.3/debian/changelog 2016-07-03 20:59:49.000000000 +0000 +++ python-etcd-0.4.3/debian/changelog 2018-10-02 18:01:15.000000000 +0000 @@ -1,3 +1,25 @@ +python-etcd (0.4.3-3) unstable; urgency=medium + + * Team upload. + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org. + * d/copyright: Use https protocol in Format field. + * d/control: Remove ancient X-Python-Version field. + * d/control: Remove ancient X-Python3-Version field. + + [ Mattia Rizzolo ] + * Drop useless build-depends on python(3)-dbg. + * Bump debhelper compat level to 11. + * Use the pybuild build system. + This also enabled for the first time build time testing. + * Bump Standards-Version to 4.2.1. + + Set Rules-Requires-Root:no. + * Add a manual call to dh_python3 as for some reason after this rebuild it + loses the dependency on python3-dnspython... + + -- Mattia Rizzolo Tue, 02 Oct 2018 20:01:15 +0200 + python-etcd (0.4.3-2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru python-etcd-0.4.3/debian/compat python-etcd-0.4.3/debian/compat --- python-etcd-0.4.3/debian/compat 2015-12-12 00:22:24.000000000 +0000 +++ python-etcd-0.4.3/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru python-etcd-0.4.3/debian/control python-etcd-0.4.3/debian/control --- python-etcd-0.4.3/debian/control 2016-07-03 20:59:13.000000000 +0000 +++ python-etcd-0.4.3/debian/control 2018-10-02 17:59:45.000000000 +0000 @@ -2,19 +2,40 @@ Section: python Priority: optional Maintainer: Debian Python Modules Team -Uploaders: Jelmer Vernooij +Uploaders: + Jelmer Vernooij , Homepage: https://github.com/jplana/python-etcd -Build-Depends: python-all (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3), python3-all, python3-all-dbg, debhelper (>= 9), python-unittest2, dh-python, python-setuptools, python3-setuptools -Standards-Version: 3.9.8 -X-Python-Version: >= 2.7 -X-Python3-Version: >= 3.3 -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-etcd.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-etcd.git +Build-Depends: + debhelper-compat (= 11), + dh-python, + python-all, + python-dnspython , + python-mock , + python-nose , + python-openssl , + python-setuptools, + python-unittest2, + python-urllib3 , + python3-all, + python3-dnspython , + python3-mock , + python3-nose , + python3-openssl , + python3-setuptools, + python3-urllib3 , +Standards-Version: 4.2.1 +Rules-Requires-Root: no +Vcs-Git: https://salsa.debian.org/python-team/modules/python-etcd.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/python-etcd Package: python-etcd Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends} -Suggests: etcd +Depends: + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends}, +Suggests: + etcd, Description: Python Etcd client library Client library for accessing and manipulating etcd contents. . @@ -22,8 +43,12 @@ Package: python3-etcd Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends} -Suggests: etcd +Depends: + ${misc:Depends}, + ${python3:Depends}, + ${shlibs:Depends}, +Suggests: + etcd, Description: Python Etcd client library - Python3 module Client library for accessing and manipulating etcd contents. . diff -Nru python-etcd-0.4.3/debian/copyright python-etcd-0.4.3/debian/copyright --- python-etcd-0.4.3/debian/copyright 2015-12-12 00:22:24.000000000 +0000 +++ python-etcd-0.4.3/debian/copyright 2018-10-02 17:21:42.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-etcd Upstream-Contact: Jose Plana Mario, Giuseppe Lavagetto Source: https://github.com/jplana/python-etcd diff -Nru python-etcd-0.4.3/debian/.git-dpm python-etcd-0.4.3/debian/.git-dpm --- python-etcd-0.4.3/debian/.git-dpm 2016-07-03 20:56:41.000000000 +0000 +++ python-etcd-0.4.3/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# see git-dpm(1) from git-dpm package -df6caa92770eb49429bf6ee23f6cebebfe44b9e5 -df6caa92770eb49429bf6ee23f6cebebfe44b9e5 -df6caa92770eb49429bf6ee23f6cebebfe44b9e5 -df6caa92770eb49429bf6ee23f6cebebfe44b9e5 -python-etcd_0.4.2.orig.tar.gz -6999d8a1da1823116acf16939d590e8e685018c4 -32193 -debianTag="debian/%e%v" -patchedTag="patched/%e%v" -upstreamTag="upstream/%e%u" diff -Nru python-etcd-0.4.3/debian/.gitignore python-etcd-0.4.3/debian/.gitignore --- python-etcd-0.4.3/debian/.gitignore 2016-07-03 20:41:41.000000000 +0000 +++ python-etcd-0.4.3/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -*~ -python-etcd/ -python3-etcd/ -*.substvars -*.debhelper.log -files -*.debhelper diff -Nru python-etcd-0.4.3/debian/rules python-etcd-0.4.3/debian/rules --- python-etcd-0.4.3/debian/rules 2015-12-12 00:22:24.000000000 +0000 +++ python-etcd-0.4.3/debian/rules 2018-10-02 18:01:15.000000000 +0000 @@ -1,18 +1,14 @@ #!/usr/bin/make -f -%: - dh $* --with python2,python3 +export PYBUILD_NAME=etcd + +# these tests fail (and never passed since the version that enabled the tests) +export PYBUILD_TEST_ARGS=-e integration -e test_auth -override_dh_auto_clean: - dh_auto_clean - rm -rf build/ - rm -rf src/python_etcd.egg-info +%: + dh $* --with python2,python3 --buildsystem pybuild -override_dh_auto_install: - dh_auto_install - set -ex; for python in $(shell py3versions -r); do \ - $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \ - done; - # Install everything excluding the *_d.so debug extensions to python-etcd and python3-etcd - dh_install -X"*_d.so" "debian/tmp/usr/lib/python2*/*-packages" -p python-etcd - dh_install -X"*_d.so" "debian/tmp/usr/lib/python3*/*-packages" -p python3-etcd +# Add a manual call to dh_python3 as for some reason after the rebuild 0.4.3-3 +# it loses the dependency on python3-dnspython... +override_dh_python3: + dh_python3 --depends dnspython