[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-1-g4048271



The following commit has been merged in the master branch:
commit 40482711f8f2818736164d0810546841de073b82
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri Feb 25 17:53:53 2011 +0000

    Fix false-positive for /lib64 in binary-from-other-architecture
    
    * checks/binaries:
      + [ADB] Update binary-from-other-architecture's tests in line with the
        changes to filename output introduced in 2.5.0~rc1.  (Closes: #614906)

diff --git a/checks/binaries b/checks/binaries
index c67d103..4325465 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -262,7 +262,7 @@ foreach my $file (@{$info->sorted_file_info}) {
     }
 
     if ($arch ne 'all' and $fileinfo !~ m/$ARCH_REGEX{$arch}/) {
-	if ($file =~ m,/lib(\d{2})/, or $file =~ m,/emul/ia(\d{2}),) {
+	if ($file =~ m,(?:^|/)lib(\d{2})/, or $file =~ m,^emul/ia(\d{2}),) {
 	    tag 'binary-from-other-architecture', $file
 		unless ($fileinfo =~ m/$ARCH_REGEX{$1}/);
 	} elsif ($arch eq 'amd64' and $fileinfo =~ m/$ARCH_REGEX{i386}/) {
diff --git a/debian/changelog b/debian/changelog
index cf0af8b..e6f3890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lintian (2.5.0~rc2) UNRELEASED; urgency=low
+
+  * checks/binaries:
+    + [ADB] Update binary-from-other-architecture's tests in line with the
+      changes to filename output introduced in 2.5.0~rc1.  (Closes: #614906)
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk>  Fri, 25 Feb 2011 17:48:59 +0000
+
 lintian (2.5.0~rc1) experimental; urgency=low
 
   The "welcome Niels Thykier!" release.

-- 
Debian package checker


Reply to: