[SCM] Debian package checker branch, master, updated. 2.0.0-42-gfba7268
The following commit has been merged in the master branch:
commit fba7268990cb472839fc58f5f43278bac1c6b182
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Mon Nov 17 20:12:28 2008 +0000
Only issue one of the symbols-file-contains*debian-revision tags for a symbol.
* checks/shared-libs:
+ Don't issue both symbols-file-contains-debian-revision and
symbols-file-contains-current-version-with-debian-revision for any
given symbol, as the latter implies the former and may thus create
noise in the tests' output. (Closes: #505826)
diff --git a/checks/shared-libs b/checks/shared-libs
index 06d83ee..ce31bda 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -395,8 +395,7 @@ if ($#shlibs == -1) {
if (($v eq $version) and ($version =~ /-/)) {
$full_version_sym ||= $sym;
$full_version_count++;
- }
- if (($v =~ /-/) and (not $v =~ /~$/) and ($v ne $version_wo_rev)) {
+ } elsif (($v =~ /-/) and (not $v =~ /~$/) and ($v ne $version_wo_rev)) {
$debian_revision_sym ||= $sym;
$debian_revision_count++;
}
diff --git a/debian/changelog b/debian/changelog
index a10076a..66914a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,11 @@ lintian (2.1.0) unstable; urgency=low
(Closes: #498892)
* check/scripts:
+ [FL] Use $known_shells_regex from common_data.
+ * checks/shared-libs:
+ + [ADB] Don't issue both symbols-file-contains-debian-revision and
+ symbols-file-contains-current-version-with-debian-revision for any
+ given symbol, as the latter implies the former and may thus create
+ noise in the tests' output. (Closes: #505826)
* collection/objdump-info:
+ [ADB] Only use readelf to emulate objdump if objdump returned "file
diff --git a/testset/tags.libbaz b/testset/tags.libbaz
index 74f02ca..825afd9 100644
--- a/testset/tags.libbaz
+++ b/testset/tags.libbaz
@@ -51,7 +51,7 @@ W: libbaz1: shlib-missing-in-symbols-control-file libbaz2 1.0 for usr/lib/libfoo
W: libbaz1: shlib-missing-in-symbols-control-file libbaz3 1 for usr/lib/libbaz3.so.1.0.3b
W: libbaz1: shlibs-declares-dependency-on-other-package libbaz1 (>> 1-1)
W: libbaz1: shlibs-declares-dependency-on-other-package libbaz2
-W: libbaz1: symbols-file-contains-debian-revision on symbol pw and 1 others
+W: libbaz1: symbols-file-contains-debian-revision on symbol foo
W: libbaz1: unused-shlib-entry-in-control-file libbaz2 1.1
W: libbaz1: unused-shlib-entry-in-control-file libbaz4 1
W: libbaz1: unused-shlib-entry-in-control-file libbaz5 1
--
Debian package checker
Reply to: