在 2024-07-23星期二的 06:00 +0000,Gábor Németh写道: > On 2024-07-22 21:08, Boyuan Yang wrote: > > 在 2024-07-22星期一的 06:18 +0000,Gábor Németh写道: > > > Hi, > > > > > > On 2024-07-22 03:05, Boyuan Yang wrote: > > > > > https://mentors.debian.net/debian/pool/main/m/msc-generator/msc-generator_8.6.2-1.dsc > > > > > > > > I think all changes look okay except for adding the usage of > > > > dpkg-vendor and > > > > exporting a specific environment variable only on Debian in > > > > debian/rules. > > > > > > I'll try to explain. This env var: > > > > > > +VENDOR ?= $(shell dpkg-vendor --query vendor) > > > ... > > > +ifneq ($(VENDOR),Debian) > > > +export PNGDIFF_LUMA_DIFF = 10 > > > +endif > > > > > > In short, `dpkg-vendor` here only controls precision of PNG-generating > > > tests and has no effect on the binary tool itself whatsoever. > > > > > > [1] https://bugs.launchpad.net/ubuntu/+source/msc-generator/+bug/2061755 > > > > If you are tackling [1], I have to remind you that your dpkg-vendor > > comparison > > only applies to Debian and won't go into effect on Ubuntu. In other words, > > I understand that and in no case want to handle any other distros at > all. That is why I'm setting the variable for all cases *except* Debian. > > > My current understanding is that this environment variable loosens the > > comparison threshold in tests. > > That is right: I want to loosen the tests in every distro except Debian. > The rationale is that upstream's CI works on Debian so there we expect > the default (=stricter) test settings to pass. > > Can you agree?
Okay if it is more strict in Debian than other derivatives and not vice versa. If possible, please add the following comment to your debian/rules so that future viewers are aware of this change: diff --git a/debian/rules b/debian/rules index 44591f3..53f6098 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ ifneq ($(ARCH),amd64) export MSC_TEST_ALLOWFAIL = 1 export PNGDIFF_NOFONT_MASK_RADIUS = 3 endif +# for dpkg-vendor, see https://bugs.debian.org/1076211#49 ifneq ($(VENDOR),Debian) export PNGDIFF_LUMA_DIFF = 10 endif I am uploading with the addition of this single comment line. Best, Boyuan Yang
signature.asc
Description: This is a digitally signed message part