Package: lintian Version: 2.5.0~rc2 Severity: normal Tags: patch
Some lintian tests fail on i686-linux-gnu (which is the DEB_BUILD_GNU_TYPE for i386 on Ubuntu). The attached patch fixes those two test cases.
diff --git a/t/tests/binaries-from-other-arch/debian/debian/dumpobj b/t/tests/binaries-from-other-arch/debian/debian/dumpobj index e622de4..b23554d 100644 --- a/t/tests/binaries-from-other-arch/debian/debian/dumpobj +++ b/t/tests/binaries-from-other-arch/debian/debian/dumpobj @@ -4,7 +4,7 @@ set -e DEB_BUILD_GNU_TYPE="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" case $DEB_BUILD_GNU_TYPE in -i486-linux-gnu|x86_64-linux-gnu) +i486-linux-gnu|i686-linux-gnu|x86_64-linux-gnu) base64 -d <<DATA f0VMRgEBAQAAAAAAAAAAAAIAKAABAAAAMIEAADQAAAA4bwkAAgAABDQAIAAGACgAGwAaAAEAAHDY WgkA2NoJANjaCQBQCgAAUAoAAAQAAAAEAAAAAQAAAAAAAAAAgAAAAIAAAKhlCQCoZQkABQAAAACA diff --git a/t/tests/binaries-multiarch/debian/Makefile b/t/tests/binaries-multiarch/debian/Makefile index 61aab6a..4ed23c4 100644 --- a/t/tests/binaries-multiarch/debian/Makefile +++ b/t/tests/binaries-multiarch/debian/Makefile @@ -1,7 +1,7 @@ TRIPLETT = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -ifeq (i486-linux-gnu,$(TRIPLETT)) +ifeq (,$(filter-out i486-linux-gnu i686-linux-gnu,$(TRIPLETT))) WRONG_TRIPLETT = x86_64-linux-gnu else WRONG_TRIPLETT = i486-linux-gnu diff --git a/t/tests/binaries-multiarch/post_test b/t/tests/binaries-multiarch/post_test index bef12aa..0c650e8 100644 --- a/t/tests/binaries-multiarch/post_test +++ b/t/tests/binaries-multiarch/post_test @@ -1,2 +1,2 @@ -s/i486-linux-gnu/x86_64-linux-gnu/ +s/i[46]86-linux-gnu/x86_64-linux-gnu/ s/is for i386/is for amd64/