[lintian] 03/03: c/shared-libs: fix FP dev-pkg-without-shlib-symlink for GCC runtime libs
This is an automated email from the git hooks/post-receive script.
jwilk pushed a commit to branch master
in repository lintian.
commit 2a44ee4a81b5b6e139c238faeefd8d213274550c
Author: Jakub Wilk <jwilk@debian.org>
Date: Fri Oct 2 19:15:04 2015 +0200
c/shared-libs: fix FP dev-pkg-without-shlib-symlink for GCC runtime libs
---
checks/shared-libs.pm | 7 ++++---
debian/changelog | 4 ++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/checks/shared-libs.pm b/checks/shared-libs.pm
index 3549f2f..8494563 100644
--- a/checks/shared-libs.pm
+++ b/checks/shared-libs.pm
@@ -268,7 +268,7 @@ sub run {
push @alt, $link_file;
- if ($proc->pkg_src =~ m/^gcc-(\d+.\d+)$/o) {
+ if ($proc->pkg_src =~ m/^gcc-(\d+(?:.\d+)?)$/o) {
# gcc has a lot of bi-arch libs and puts the dev symlink
# in slightly different directories (to be co-installable
# with itself I guess). Allegedly, clang (etc.) have to
@@ -277,11 +277,12 @@ sub run {
my $gcc_ver = $1;
my $basename = basename($link_file);
my $madir = $MA_DIRS->value($proc->pkg_arch);
+ $madir =~ s/^i386/i586/;
my $stem;
# Generally we are looking for
# * usr/lib/gcc/MA-TRIPLET/$gcc_ver/${BIARCH}$basename
#
- # Where BIARCH is one of {,32/,n32/,x32/,sf/,hf/}. Note
+ # Where BIARCH is one of {,64/,32/,n32/,x32/,sf/,hf/}. Note
# the "empty string" as a possible option.
#
# The two-three letter name directory before the
@@ -291,7 +292,7 @@ sub run {
# just do without it as often (but not always) works.
$stem = "usr/lib/gcc/$gcc_ver" unless defined $madir;
- push @alt, map { "$stem/$_" } ('', qw(32 n32 x32 sf hf));
+ push @alt, map { "$stem/$_$basename" } ('', qw(64/ 32/ n32/ x32/ sf/ hf/));
}
PKG:
diff --git a/debian/changelog b/debian/changelog
index 743210d..7a8bf99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,10 @@ lintian (2.5.38) UNRELEASED; urgency=medium
* checks/scripts.desc:
+ [NT] Apply patch from Chris Lamb to fix a grammatical issue in a
tag description. (Closes: #797555)
+ * checks/shared-libs.pm:
+ + [JW] Fix false positive dev-pkg-without-shlib-symlink for GCC runtime
+ libraries. Thanks to Matthias Klose for the bug report.
+ (Closes: #790739)
* checks/systemd.desc:
+ [AB] Apply patch by Chris Lamb to update link to Debian systemd
packaging reference. (Closes: #799082)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: