[Git][reproducible-builds/reprotest][master] 4 commits: Allow random suffixes in the debian version compared to the upstream version
Mattia Rizzolo (@mattia)
gitlab at salsa.debian.org
Mon Nov 15 09:11:55 UTC 2021
Mattia Rizzolo pushed to branch master at Reproducible Builds / reprotest
Commits:
ffe2df86 by Mattia Rizzolo at 2021-11-15T10:03:36+01:00
Allow random suffixes in the debian version compared to the upstream version
Cloess: #999691
Thanks: Stefano Rivera <stefanor at debian.org> for the patch
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
25f83c80 by Mattia Rizzolo at 2021-11-15T10:10:44+01:00
d/rules: make use of dh13 features to simplify some build targets
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
2b80d389 by Mattia Rizzolo at 2021-11-15T10:10:50+01:00
Declaratively use dh_python3 through d/control
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
56628ecc by Mattia Rizzolo at 2021-11-15T10:10:53+01:00
wrap-and-sort
Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
4 changed files:
- debian/control
- debian/copyright
- debian/rules
- debian/tests/control
Changes:
=====================================
debian/control
=====================================
@@ -1,53 +1,59 @@
Source: reprotest
Maintainer: Reproducible builds folks <reproducible-builds at lists.alioth.debian.org>
-Uploaders: Ceridwen <ceridwenv at gmail.com>,
+Uploaders:
+ Ceridwen <ceridwenv at gmail.com>,
Holger Levsen <holger at debian.org>,
- Vagrant Cascadian <vagrant at reproducible-builds.org>
+ Vagrant Cascadian <vagrant at reproducible-builds.org>,
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 <!nodoc>,
- python3-docutils <!nodoc>,
-# tests.py uses dpkg-buildpackage which uses lintian
+ debhelper-compat (= 13),
+ dh-sequence-python3,
diffoscope (>= 112~) <!nocheck>,
faketime <!nocheck>,
+ help2man <!nodoc>,
+# tests.py uses dpkg-buildpackage which uses lintian
lintian <!nocheck>,
locales-all <!nocheck>,
+ python3-all,
python3-coverage <!nocheck>,
+ python3-docutils <!nodoc>,
python3-pytest <!nocheck>,
python3-rstr <!nocheck>,
+ python3-setuptools,
tox <!nocheck>,
# these below helps diffoscope produce nicer output in tests
python3-tlsh <!nocheck>,
unzip <!nocheck>,
- xxd <!nocheck>
+ xxd <!nocheck>,
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
=====================================
debian/copyright
=====================================
@@ -8,7 +8,7 @@ Copyright: 2017-2016 Ximin Luo <infinity0 at debian.org>
License: GPL-3+
Files: reprotest/lib/*
- reprotest/virt/*
+ reprotest/virt/*
Copyright: 2006-2016 Canonical Ltd.
License: GPL-2+
=====================================
debian/rules
=====================================
@@ -6,7 +6,7 @@ include /usr/share/dpkg/pkg-info.mk
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 @@ export PYBUILD_NAME = reprotest
# 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:
- test $$(python3 setup.py --version) = $$(echo $(DEB_VERSION) | cut -f1 -d'+')
- dh_auto_configure
+execute_before_dh_auto_configure:
+ test $$(python3 setup.py --version) = $$(echo $(DEB_VERSION) | sed 's/[^0-9.].*//')
-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 @@ autopkgtest-pytest:
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:
=====================================
debian/tests/control
=====================================
@@ -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@,
View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/compare/3ed09e34943e49c757ff51796acd557e91547b04...56628eccff9ebca7b551b8e6980559516c7d0313
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/compare/3ed09e34943e49c757ff51796acd557e91547b04...56628eccff9ebca7b551b8e6980559516c7d0313
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20211115/1eced04a/attachment.htm>
More information about the rb-commits
mailing list