[SCM] Debian package checker branch, master, updated. 2.2.9-10-g3d5f3d2

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 3d5f3d24386b9327cbe466bfe016a32f986f64ed
Author: Russ Allbery <rra@debian.org>
Date:   Sun Apr 26 17:18:12 2009 -0700

    Strip trailing slashes from libdir in *.la files
    
    * checks/shared-libs:
      + [RA] Strip trailing slashes from the libdir path in *.la files
        before checking it for correctness.  Thanks, Jonas Smedegaard.
        (Closes: #522623)

diff --git a/checks/shared-libs b/checks/shared-libs
index 3f129a6..1c0a8b4 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -164,6 +164,7 @@ for my $cur_file (sort keys %{$info->index}) {
 	while(<LAFILE>) {
 	    next unless (m/^libdir='(.+?)'$/);
 	    my $actual = $1;
+	    $actual =~ s,/+$,,;
 	    my ($expected) = ("/$cur_file" =~ m,^(.+)/[^/]+$,);
 	    tag "incorrect-libdir-in-la-file", $cur_file, "$actual != $expected"
 		unless($expected eq $actual);
diff --git a/debian/changelog b/debian/changelog
index bf00e3c..e03f219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ lintian (2.2.10) UNRELEASED; urgency=low
     + [ADB] Anchor the regular expression for the "gz-file-not-gzip" tag so
       that files with names that contain ".gz" but do not end in that string
       are not flagged.  Patch by Raphael Geissert.  (Closes: #523352)
+  * checks/shared-libs:
+    + [RA] Strip trailing slashes from the libdir path in *.la files
+      before checking it for correctness.  Thanks, Jonas Smedegaard.
+      (Closes: #522623)
   * checks/standards-version.desc:
     + [ADB] Fix a couple of spelling mistakes ("verison" -> "version").
       Thanks, Guillaume Delacour.  (Closes: #522643)
diff --git a/t/tests/shared-libs-la-files/debian/debian/install b/t/tests/shared-libs-la-files/debian/debian/install
index a814785..d767c5d 100644
--- a/t/tests/shared-libs-la-files/debian/debian/install
+++ b/t/tests/shared-libs-la-files/debian/debian/install
@@ -1 +1,2 @@
 kio_locate.la usr/lib/kde3
+trailing-slash.la usr/lib/lintian
diff --git a/t/tests/shared-libs-la-files/debian/trailing-slash.la b/t/tests/shared-libs-la-files/debian/trailing-slash.la
new file mode 100644
index 0000000..736610e
--- /dev/null
+++ b/t/tests/shared-libs-la-files/debian/trailing-slash.la
@@ -0,0 +1,12 @@
+dlname='trailing-slash.so'
+library_names='trailing-slash.so'
+old_library=''
+dependency_libs=''
+current=0
+age=0
+revision=0
+installed=yes
+shouldnotlink=no
+dlopen=''
+dlpreopen=''
+libdir='/usr/lib/lintian/'

-- 
Debian package checker