diff -Nru reprotest-0.7.18ubuntu1/debian/changelog reprotest-0.7.19/debian/changelog --- reprotest-0.7.18ubuntu1/debian/changelog 2021-11-14 23:40:48.000000000 +0000 +++ reprotest-0.7.19/debian/changelog 2021-11-15 14:14:30.000000000 +0000 @@ -1,10 +1,18 @@ -reprotest (0.7.18ubuntu1) jammy; urgency=medium +reprotest (0.7.19) unstable; urgency=medium - * Depend on diffoscope for autopkgtests. (Closes: #999689) - * Avoid needing to update setup.py when doing Ubuntu modifications. - (Closes: #999691) + [ Stefano Rivera ] + * Add diffoscope depends to autopkgtest. Closes: #999689 + * Allow random suffixes in the debian version compared to the upstream + version. Closes: #999691 - -- Stefano Rivera Sun, 14 Nov 2021 15:40:48 -0800 + [ Mattia Rizzolo ] + * d/rules: make use of dh13 features to simplify some build targets. + * Declaratively use dh_python3 through d/control. + + [ Holger Levsen ] + * Release as 0.7.19. + + -- Holger Levsen Mon, 15 Nov 2021 15:14:30 +0100 reprotest (0.7.18) unstable; urgency=medium diff -Nru reprotest-0.7.18ubuntu1/debian/control reprotest-0.7.19/debian/control --- reprotest-0.7.18ubuntu1/debian/control 2021-11-14 23:40:48.000000000 +0000 +++ reprotest-0.7.19/debian/control 2021-11-15 14:04:27.000000000 +0000 @@ -1,54 +1,59 @@ Source: reprotest -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Reproducible builds folks -Uploaders: Ceridwen , +Maintainer: Reproducible builds folks +Uploaders: + Ceridwen , Holger Levsen , - Vagrant Cascadian + Vagrant Cascadian , Section: devel Priority: optional Standards-Version: 4.6.0 Rules-Requires-Root: no Build-Depends: - debhelper-compat (=13), - dh-python, - python3-all, - python3-setuptools, - help2man , - python3-docutils , -# tests.py uses dpkg-buildpackage which uses lintian + debhelper-compat (= 13), + dh-sequence-python3, diffoscope (>= 112~) , faketime , + help2man , +# tests.py uses dpkg-buildpackage which uses lintian lintian , locales-all , + python3-all, python3-coverage , + python3-docutils , python3-pytest , python3-rstr , + python3-setuptools, tox , # these below helps diffoscope produce nicer output in tests python3-tlsh , unzip , - xxd + xxd , Vcs-Git: https://salsa.debian.org/reproducible-builds/reprotest.git Vcs-Browser: https://salsa.debian.org/reproducible-builds/reprotest Package: reprotest Architecture: all -Depends: ${python3:Depends}, - python3-debian, +Depends: apt-utils, libdpkg-perl, procps, + python3-debian, + python3-distro, python3-pkg-resources, python3-rstr, - python3-distro, - ${misc:Depends} + ${misc:Depends}, + ${python3:Depends}, Recommends: - ${python3:Recommends}, disorderfs, faketime, locales-all, sudo, -Suggests: autodep8, schroot, qemu-system, qemu-utils + ${python3:Recommends}, +Suggests: + autodep8, + qemu-system, + qemu-utils, + schroot, Description: Build software and check it for reproducibility reprotest builds the same source code twice in different environments, and then checks the binaries produced by each build for differences. If any are diff -Nru reprotest-0.7.18ubuntu1/debian/copyright reprotest-0.7.19/debian/copyright --- reprotest-0.7.18ubuntu1/debian/copyright 2021-11-14 23:40:48.000000000 +0000 +++ reprotest-0.7.19/debian/copyright 2021-11-15 14:04:27.000000000 +0000 @@ -8,7 +8,7 @@ License: GPL-3+ Files: reprotest/lib/* - reprotest/virt/* + reprotest/virt/* Copyright: 2006-2016 Canonical Ltd. License: GPL-2+ diff -Nru reprotest-0.7.18ubuntu1/debian/rules reprotest-0.7.19/debian/rules --- reprotest-0.7.18ubuntu1/debian/rules 2021-11-14 23:40:48.000000000 +0000 +++ reprotest-0.7.19/debian/rules 2021-11-15 14:04:27.000000000 +0000 @@ -6,7 +6,7 @@ export PYBUILD_NAME = reprotest %: - dh $@ --with python3 --buildsystem=pybuild + dh $@ --buildsystem=pybuild , := , # It's hard to make sure disorderfs works on buildds, so drop it. @@ -19,24 +19,18 @@ # in that case. export REPROTEST_TEST_DONTVARY = fileordering,user_group,domain_host$(if $(shell nproc | grep --color=no -Fx 1),$(,)num_cpus,) -override_dh_auto_configure: +execute_before_dh_auto_configure: test $$(python3 setup.py --version) = $$(echo $(DEB_VERSION) | sed 's/[^0-9.].*//') - dh_auto_configure -override_dh_auto_build: - dh_auto_build +execute_after_dh_auto_build: $(MAKE) -C doc override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -ifeq (,$(filter nocheck,$(DEB_BUILD_PROFILES))) VIRTUALENV_DOWNLOAD=no \ http_proxy=http://127.0.9.1:9 \ https_proxy=https://127.0.9.1:9 \ TOX_TESTENV_PASSENV=PYTHONIOENCODING PYTHONIOENCODING=utf-8 \ tox -r --sitepackages -- -s -endif -endif # This is meant to be run by autopkgtest, and runs against the *installed* # version of reprotest. To run it against the development version, give @@ -46,8 +40,7 @@ REPROTEST_TEST_DONTVARY="$(REPROTEST_TEST_DONTVARY)" pytest-3 $(if $(PYTEST_MARKEXPR),-m "$(PYTEST_MARKEXPR)",) $(PYTEST_ARGS) -override_dh_auto_clean: - dh_auto_clean +execute_after_dh_auto_clean: $(MAKE) -C doc clean override_dh_python3: diff -Nru reprotest-0.7.18ubuntu1/debian/tests/control reprotest-0.7.19/debian/tests/control --- reprotest-0.7.18ubuntu1/debian/tests/control 2021-11-14 23:40:48.000000000 +0000 +++ reprotest-0.7.19/debian/tests/control 2021-11-15 14:04:27.000000000 +0000 @@ -1,5 +1,14 @@ Test-Command: debian/rules autopkgtest-pytest PYTEST_MARKEXPR="not need_builddeps" -Depends: @, diffoscope, python3-pytest, faketime, locales-all, fakeroot +Depends: + diffoscope, + fakeroot, + faketime, + locales-all, + python3-pytest, + @, Test-Command: debian/rules autopkgtest-pytest PYTEST_MARKEXPR="need_builddeps" -Depends: @, @builddeps@, fakeroot +Depends: + fakeroot, + @, + @builddeps@, diff -Nru reprotest-0.7.18ubuntu1/setup.py reprotest-0.7.19/setup.py --- reprotest-0.7.18ubuntu1/setup.py 2021-11-14 23:40:48.000000000 +0000 +++ reprotest-0.7.19/setup.py 2021-10-13 08:58:32.000000000 +0000 @@ -6,7 +6,7 @@ from setuptools import setup, find_packages setup(name='reprotest', - version='0.7.18', + version='0.7.19', description='Build packages and check them for reproducibility.', long_description=open('README.rst', encoding='utf-8').read(), author='Ximin Luo, Ceridwen',