[SCM] Debian package checker branch, master, updated. 1.24.3-31-g60732e4
The following commit has been merged in the master branch:
commit 60732e42efd79796768b72ee2e9bf54b3ca68b3a
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Wed Aug 13 09:38:04 2008 +0100
Correctly match unversioned alternative dependency templates in symbols files
In a symbols file, an alternative dependency template need not specify a
required version of the package being depended upon. Update the symbols
file parsing code to recognise such templates, removing the false
positives generated by libc6-amd64 (and probably others). This was
already handled correctly for the main dependency template.
diff --git a/checks/shared-libs b/checks/shared-libs
index a004113..06d83ee 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -362,14 +362,14 @@ if ($#shlibs == -1) {
$dep_templates = 0;
$meta_info_seen = 0;
- } elsif (m/^\|\s+(\S+)\s(\S+(\s\S+)?)$/) {
+ } elsif (m/^\|\s+(\S+)(?:\s(\S+(\s\S+)))?$/) {
# alternative dependency template
if ($meta_info_seen or not defined $soname) {
tag "syntax-error-in-symbols-file", $.;
}
- ($dep_package, $dep) = ($1, $2);
+ ($dep_package, $dep) = ($1, $2 || '');
push @symbols_depends, $dep_package . ' ' . $dep;
$dep_templates++;
} elsif (m/^\*\s(\S+):\s(\S+)/) {
diff --git a/debian/changelog b/debian/changelog
index ab3cd16..fa2e23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,10 +19,11 @@ lintian (1.24.4) UNRELEASED; urgency=low
command-with-path-in-maintainer-script to avoid truncation. Thanks,
Thijs Kinkhorst. (Closes: #494723)
+ [RA] Add jruby1.1, thanks Sebastien Delafond. (Closes: #494919)
- * checks/shared-libs.desc:
+ * checks/shared-libs{,.desc}:
+ [RA] Clarify that shlibs-declares-dependency-on-other-package can be
issued for a version mismatch. (Closes: #494400)
-
+ + [ADB] Correctly match alternative dependency templates in symbols
+ files which specify an unversioned dependency.
* collection/objdump-info:
+ [ADB] Correctly parse a readelf symbol version block containing the
definition of a single symbol.
--
Debian package checker
Reply to: