[SCM] Debian package checker branch, master, updated. 2.5.10-32-ge0ff721
The following commit has been merged in the master branch:
commit e0ff721d54656cbc296c38e8100462fdcae1fded
Author: Niels Thykier <niels@thykier.net>
Date: Fri Jul 13 14:00:27 2012 +0200
c/cruft: Detect MS-DOS binaries
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index ff67730..79a9a7c 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -152,7 +152,7 @@ for my $file (keys(%$file_info)) {
next if ($file =~ m,(?:^|/)t(?:est(?:s(?:et)?)?)?/,);
if ($file_info->{$file} =~ m/\bELF\b/) {
tag 'source-contains-prebuilt-binary', $file;
- } elsif ($file_info->{$file} =~ m/\b(?:PE(?:32|64)|COFF executable)\b/) {
+ } elsif ($file_info->{$file} =~ m/\b(?:MS-DOS|PE(?:32|64)|COFF executable)\b/) {
tag 'source-contains-prebuilt-windows-binary', $file;
} elsif ($file =~ /\bwaf$/) {
my $ok = 1;
diff --git a/debian/changelog b/debian/changelog
index 472291f..6cc29d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
apparently-corrupted-elf-binary.
+ [NT] Remove some references to objdump in tag descriptions
as Lintian uses readelf.
+ * checks/cruft:
+ + [NT] Detect MS-DOS executables as windows binaries.
* checks/deb-format{,.desc}:
+ [NT] Retire data.tar.xz tag. (Closes: #680391)
* checks/fields.desc:
diff --git a/t/COVERAGE b/t/COVERAGE
index 3f1a637..4df8266 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,13 +1,11 @@
Last generated 2012-07-13
-Coverage: 826/964 (85.68%), w. legacy tests: 927/964 (96.16%)
+Coverage: 827/964 (85.79%), w. legacy tests: 928/964 (96.27%)
The following tags are not tested by the test suite:
binaries binary-file-compressed-with-upx
binaries ocaml-custom-executable
-cruft source-contains-prebuilt-windows-binary
-
deb-format tar-errors-from-data
debconf boolean-template-has-bogus-default
diff --git a/t/tests/cruft-general-upstream/desc b/t/tests/cruft-general-upstream/desc
index 58bfaea..9e63917 100644
--- a/t/tests/cruft-general-upstream/desc
+++ b/t/tests/cruft-general-upstream/desc
@@ -16,6 +16,7 @@ Test-For:
source-contains-git-control-dir
source-contains-hg-control-dir
source-contains-hg-tags-file
+ source-contains-prebuilt-windows-binary
source-contains-svk-commit-file
source-contains-svn-commit-file
source-contains-svn-conflict-file
diff --git a/t/tests/cruft-general-upstream/pre_upstream b/t/tests/cruft-general-upstream/pre_upstream
index f8e75e7..3745077 100755
--- a/t/tests/cruft-general-upstream/pre_upstream
+++ b/t/tests/cruft-general-upstream/pre_upstream
@@ -30,3 +30,5 @@ echo 'source-contains-cvs-conflict-copy' > "${dir}/.#foo.1.1"
echo 'source-contains-svn-conflict-file' > "${dir}/foo.r1352"
echo 'configure-generated-file-in-source' > "${dir}/config.cache"
+
+printf "MZ\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x3c" > "${dir}/fake-win32-bin.exe"
diff --git a/t/tests/cruft-general-upstream/tags b/t/tests/cruft-general-upstream/tags
index 89173cb..86b8a2a 100644
--- a/t/tests/cruft-general-upstream/tags
+++ b/t/tests/cruft-general-upstream/tags
@@ -7,6 +7,7 @@ P: cruft-general-upstream source: source-contains-cvs-control-dir CVS
P: cruft-general-upstream source: source-contains-git-control-dir .git
P: cruft-general-upstream source: source-contains-hg-control-dir .hg
P: cruft-general-upstream source: source-contains-hg-tags-file .hgtags
+P: cruft-general-upstream source: source-contains-prebuilt-windows-binary fake-win32-bin.exe
P: cruft-general-upstream source: source-contains-svk-commit-file svk-commit444.tmp
P: cruft-general-upstream source: source-contains-svn-commit-file svn-commit.tmp
P: cruft-general-upstream source: source-contains-svn-conflict-file foo.r1352
--
Debian package checker
Reply to: