[SCM] Debian package checker branch, master, updated. 2.5.2-66-gf3cae4c
The following commit has been merged in the master branch:
commit f3cae4ccbaee92cd276875392b2c6b58b90daca6
Author: Niels Thykier <niels@thykier.net>
Date: Tue Aug 30 22:48:52 2011 +0200
Ignore non-ELF files for "missing pre-dep on ma-support"
diff --git a/checks/files b/checks/files
index 5315e56..ff0a0fe 100644
--- a/checks/files
+++ b/checks/files
@@ -738,7 +738,9 @@ foreach my $file (@{$info->sorted_index}) {
if ($type ne 'udeb' && $index_info->{type} ne 'l' && $pkg !~ m/^libc[0-9]/o &&
$file =~ m,^(?:usr/)?lib/([^/]+)/lib[^/]+\.so(?:\.[^/]+)?$,o) {
my $subdir = $1;
- $TRIPLETS = Lintian::Data->new('files/triplets', '\s+')
+ # Skip if it not an ELF file (probably a .so script)
+ next unless ($info->file_info->{$file}//'') =~ m/\bELF\b/o;
+ $TRIPLETS = Lintian::Data->new('files/triplets', qr/\s++/o)
unless defined($TRIPLETS);
if ($TRIPLETS->known($subdir) && $info->field('architecture') eq $TRIPLETS->value($subdir)) {
my $dep = Lintian::Relation->new($info->field('pre-depends')//'');
diff --git a/debian/changelog b/debian/changelog
index 07fe7bb..88c56f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,9 @@ lintian (2.5.3) UNRELEASED; urgency=low
static libraries, .pc-, elf and pyshared-data-files. This
covers all the false-positives currently found in the liblicense
package. (Closes: #617901)
+ + [NT] Ignore non-ELF files in multiarch paths, when checking for
+ a missing pre-depends on multiarch-support. Thanks to Sven
+ Joachim for the report. (Closes: #639735)
* checks/shared-libs.desc:
+ [JW] Fixed a typo in a tag description. (Closes: #639177)
* checks/source-copyright{,.desc}:
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/Makefile b/t/tests/files-multiarch-so-script/debian/Makefile
similarity index 74%
copy from t/tests/files-multiarch-missing-pre-deps/debian/Makefile
copy to t/tests/files-multiarch-so-script/debian/Makefile
index a34620f..2dd5571 100644
--- a/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
+++ b/t/tests/files-multiarch-so-script/debian/Makefile
@@ -13,12 +13,12 @@ endif
all:
- gcc -fPIC -shared -Wl,-z,defs -Wl,-soname,libbasic.so.2 -o libbasic.so.2 basic.c
+ echo "INPUT(libsome.so)" > libbasic.so.2
install:
# install it under the correct triplet directory
install -d $(DESTDIR)/usr/lib/$(TRIPLETT)
- install -m 644 -c -s libbasic.so.2 $(DESTDIR)/usr/lib/$(TRIPLETT)/libbasic.so.2
+ install -m 644 -c libbasic.so.2 $(DESTDIR)/usr/lib/$(TRIPLETT)/libbasic.so.2
clean distclean:
rm -f libbasic.so.2
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in b/t/tests/files-multiarch-so-script/debian/debian/control.in
similarity index 100%
copy from t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
copy to t/tests/files-multiarch-so-script/debian/debian/control.in
diff --git a/t/tests/binaries-multiarch/debian/debian/rules b/t/tests/files-multiarch-so-script/debian/debian/rules
similarity index 100%
copy from t/tests/binaries-multiarch/debian/debian/rules
copy to t/tests/files-multiarch-so-script/debian/debian/rules
diff --git a/t/tests/files-multiarch-so-script/desc b/t/tests/files-multiarch-so-script/desc
new file mode 100644
index 0000000..7c6f153
--- /dev/null
+++ b/t/tests/files-multiarch-so-script/desc
@@ -0,0 +1,7 @@
+Testname: files-multiarch-so-script
+Sequence: 6000
+Version: 1.0
+Description: Multiarch-related tests with "so" script
+Architecture: i386 amd64
+Test-Against:
+ missing-pre-dependency-on-multiarch-support
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/files-multiarch-so-script/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/files-multiarch-so-script/tags
--
Debian package checker
Reply to: