[Git][reproducible-builds/diffoscope][master] 4 commits: override several lintian warnings regarding prebuild binaries in the source.

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
bbcd902d by Mattia Rizzolo at 2021-01-17T19:16:38+01:00
override several lintian warnings regarding prebuild binaries in the source.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
5cdac596 by Mattia Rizzolo at 2021-01-17T19:18:11+01:00
Add a pytest.ini to explicitly use junit's xunit2 format

This saves a DeprecationWrning in jenkins.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
b359478a by Mattia Rizzolo at 2021-01-17T19:18:38+01:00
Ignore the DeprecationWarning regarding the `imp` module deprecation, as it comes from a 3rd party library

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
201d2505 by Mattia Rizzolo at 2021-01-17T19:23:09+01:00
d/rules: filter the content of the d/*.substvars files

This fixes some dpkg-gencontrol warnings:
dpkg-gencontrol: warning: package diffoscope: substitution variable ${diffoscope-minimal:Recommends} unused, but is defined
dpkg-gencontrol: warning: package diffoscope-minimal: substitution variable ${diffoscope:Recommends} unused, but is defined

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- debian/rules
- debian/source/lintian-overrides
- + pytest.ini


Changes:

=====================================
debian/rules
=====================================
@@ -55,10 +55,9 @@ override_dh_python3:
 	sed -i 's/python3-binwalk,//' debian/diffoscope-minimal.substvars
 
 execute_before_dh_gencontrol:
-	bin/diffoscope --list-debian-substvars | tee -a \
-		debian/diffoscope.substvars \
-		debian/diffoscope-minimal.substvars \
-		> /dev/null
+	bin/diffoscope --list-debian-substvars | tee \
+		>(sed '/^diffoscope-minimal:/d' >> debian/diffoscope.substvars) | \
+		sed '/^diffoscope:R/d' >> debian/diffoscope-minimal.substvars
 	head debian/*.substvars
 
 diffoscope/presenters/icon.py: favicon.png


=====================================
debian/source/lintian-overrides
=====================================
@@ -7,3 +7,12 @@ public-upstream-key-in-native-package
 
 # We are upstream but also quite integrated in Debian.
 upstream-metadata-in-native-source
+
+# we are fully aware of this
+# https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/66
+source-is-missing tests/data/test1.debug
+source-is-missing tests/data/test1.o
+source-is-missing tests/data/test2.debug
+source-is-missing tests/data/test2.o
+source-contains-prebuilt-windows-binary tests/data/test1.exe
+source-contains-prebuilt-windows-binary tests/data/test2.exe


=====================================
pytest.ini
=====================================
@@ -0,0 +1,6 @@
+[pytest]
+junit_family=xunit2
+# this comes from binwalk
+# https://github.com/ReFirmLabs/binwalk/issues/507
+filterwarnings =
+    ignore:the imp module is deprecated in favour of importlib.*:DeprecationWarning



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/efcacdb35ef30c0108f20d6f3636e1085cc381d6...201d2505fe06ae815e789f6bab7d5a73dd6f0389

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/efcacdb35ef30c0108f20d6f3636e1085cc381d6...201d2505fe06ae815e789f6bab7d5a73dd6f0389
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/20210117/a4b52864/attachment.htm>