[SCM] Debian package checker branch, master, updated. 2.2.9-12-g20900eb

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

The following commit has been merged in the master branch:
commit 20900eb8b02d55c11e35b616799c9f8094c34708
Author: Russ Allbery <rra@debian.org>
Date:   Sun Apr 26 17:30:59 2009 -0700

    Special-case *.la files for Python modules
    
    * checks/shared-libs:
      + [RA] Special-case *.la files for Python modules installed in
        /usr/share/pyshared, since they're moved during install.  Thanks,
        Jonas Smedegaard.  (Closes: #522623)

diff --git a/checks/shared-libs b/checks/shared-libs
index 1c0a8b4..88511b9 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -166,6 +166,11 @@ for my $cur_file (sort keys %{$info->index}) {
 	    my $actual = $1;
 	    $actual =~ s,/+$,,;
 	    my ($expected) = ("/$cur_file" =~ m,^(.+)/[^/]+$,);
+
+	    # python-central is a special case since the libraries are moved
+	    # at install time.
+	    next if ($actual =~ m,^/usr/lib/python[\d.]+/site-packages,
+		     and $expected =~ m,^/usr/share/pyshared,);
 	    tag "incorrect-libdir-in-la-file", $cur_file, "$actual != $expected"
 		unless($expected eq $actual);
 	    last;
diff --git a/debian/changelog b/debian/changelog
index d2365a4..5af7001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ lintian (2.2.10) UNRELEASED; urgency=low
     + [RA] Strip trailing slashes from the libdir path in *.la files
       before checking it for correctness.  Thanks, Patrick Matthäi.
       (Closes: #524228)
+    + [RA] Special-case *.la files for Python modules installed in
+      /usr/share/pyshared, since they're moved during install.  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/trailing-slash.la b/t/tests/shared-libs-la-files/debian/_python_module.la
similarity index 52%
copy from t/tests/shared-libs-la-files/debian/trailing-slash.la
copy to t/tests/shared-libs-la-files/debian/_python_module.la
index 736610e..6b425c0 100644
--- a/t/tests/shared-libs-la-files/debian/trailing-slash.la
+++ b/t/tests/shared-libs-la-files/debian/_python_module.la
@@ -1,5 +1,5 @@
-dlname='trailing-slash.so'
-library_names='trailing-slash.so'
+dlname='_python_module.so'
+library_names='_python_module.so'
 old_library=''
 dependency_libs=''
 current=0
@@ -9,4 +9,4 @@ installed=yes
 shouldnotlink=no
 dlopen=''
 dlpreopen=''
-libdir='/usr/lib/lintian/'
+libdir='/usr/lib/python2.5/site-packages'
diff --git a/t/tests/shared-libs-la-files/debian/debian/install b/t/tests/shared-libs-la-files/debian/debian/install
index d767c5d..7bdf454 100644
--- a/t/tests/shared-libs-la-files/debian/debian/install
+++ b/t/tests/shared-libs-la-files/debian/debian/install
@@ -1,2 +1,3 @@
 kio_locate.la usr/lib/kde3
 trailing-slash.la usr/lib/lintian
+_python_module.la usr/share/pyshared

-- 
Debian package checker