Source: lxml Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The version is derived from the build directory name, which gets embedded into the changes-VERSION.html file: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/lxml.html usr/share/doc/python-lxml/html/changes-4.6.3+dfsg.html vs. usr/share/doc/python-lxml/html/changes-2nd.html The attached patch changes debian/rules to use DEB_UPSTREAM_VERSION from dpkg's pkg-info.mk instead of deriving the upstream version from the build directory. Unfortunately, there are other build path related issues in binaries, but this significantly reduces the diff between builds. Thanks for maintaining lxml! live well, vagrant
From 95c022663849bc83ad5f76ef7be17809494b8bfb Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <vagr...@reproducible-builds.org> Date: Sun, 11 Jul 2021 20:15:53 +0000 Subject: [PATCH 3/3] Use DEB_VERSION_UPSTREAM from dpkg/pkg-info.mk to pass the upstream version to doc/mkhtml.py. Assuming that the build directory contains the package name and version will result in different builds dependent on the build path. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 466e936..9c1e0d0 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ PY3VERS := $(shell py3versions -vs) PY3VER := $(shell py3versions -vd) -UPSTREAMVER := $(subst lxml-,,$(notdir $(CURDIR))) +include /usr/share/dpkg/pkg-info.mk # Some locales trigger reproducibility issues in html documentation export LC_ALL=C.UTF-8 @@ -29,7 +29,7 @@ build3-stamp: $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%) build3-python%: prebuild python$* setup.py build ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) - python$* doc/mkhtml.py doc/html . $(UPSTREAMVER) + python$* doc/mkhtml.py doc/html . $(DEB_VERSION_UPSTREAM) endif touch $@ dbg-build3-python%: prebuild -- 2.32.0
signature.asc
Description: PGP signature
