[SCM] Debian package checker branch, master, updated. 2.2.12-6-ga5d2e04

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

The following commit has been merged in the master branch:
commit a5d2e048ba68fdfec615280c33f09cabb55e75b9
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jun 21 16:23:06 2009 -0700

    Suppress libtool warnings with build-depends on libtool
    
    * checks/cruft:
      + [RA] Don't warn about outdated libtool if the package build-depends
        on libtool.  Thanks, Kurt Roeckx.  (Closes: #534134)

diff --git a/checks/cruft b/checks/cruft
index 6449cf9..fcc3e8b 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -111,8 +111,9 @@ if (defined $info->field('architecture')) {
     }
 }
 
-# Read build-depends file and see if it depends on autotools-dev or automake.
+# Check if the package build-depends on autotools-dev, automake, or libtool.
 my $atdinbd = $info->relation('build-depends')->implies($AUTOTOOLS);
+my $ltinbd  = $info->relation('build-depends')->implies('libtool');
 
 # Create a closure so that we can pass our lexical variables into the find
 # wanted function.  We don't want to make them global because we'll then leak
@@ -125,7 +126,7 @@ if ($format =~ /^\s*2\.0\s*\z/ or $format =~ /^\s*3\.0\s*\(quilt\)/) {
 } elsif (not $info->native) {
     check_diffstat("diffstat", \%warned);
 }
-my $wanted = sub { find_cruft($pkg, $info, \%warned, $atdinbd) };
+my $wanted = sub { find_cruft($pkg, $info, \%warned, $atdinbd, $ltinbd) };
 find($wanted, 'unpacked');
 
 # Look for cruft based on file's results, but allow cruft in test directories
@@ -270,7 +271,7 @@ sub check_debfiles {
 # "source-contains" tag.  The tag isn't entirely accurate, but it's better
 # than creating yet a third set of tags, and this gets the severity right.
 sub find_cruft {
-    my ($pkg, $info, $warned, $atdinbd) = @_;
+    my ($pkg, $info, $warned, $atdinbd, $ltinbd) = @_;
     (my $name = $File::Find::name) =~ s,^(\./)?unpacked/,,;
 
     # Ignore files in test suites.  They may be part of the test.
@@ -320,9 +321,9 @@ sub find_cruft {
             }
         }
         close F;
-    } elsif ($name =~ m,^(.+/)?ltconfig$,) {
+    } elsif ($name =~ m,^(.+/)?ltconfig$, and not $ltinbd) {
         tag "ancient-libtool", $name;
-    } elsif ($name =~ m,^(.+/)?ltmain\.sh$,) {
+    } elsif ($name =~ m,^(.+/)?ltmain\.sh$, and not $ltinbd) {
         my $b = basename $name;
         open (F, '<', $b) or die "can't open $name: $!";
         while (<F>) {
diff --git a/debian/changelog b/debian/changelog
index c95dd39..89b99e6 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 lintian (2.2.13) UNRELEASED; urgency=low
 
+  * checks/cruft:
+    + [RA] Don't warn about outdated libtool if the package build-depends
+      on libtool.  Thanks, Kurt Roeckx.  (Closes: #534134)
   * checks/patch-systems:
     + [RA] Don't include the package name as extra data in tags that are
       only issued for source packages.  Patch from Raphael Geissert.
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in b/t/tests/cruft-updated-libtool/debian/debian/control.in
similarity index 91%
copy from t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
copy to t/tests/cruft-updated-libtool/debian/debian/control.in
index 76b52f1..b8924bb 100644
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
+++ b/t/tests/cruft-updated-libtool/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
 Section: {$section}
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 7), libtool
 
 Package: {$srcpkg}
 Architecture: {$architecture}
diff --git a/t/tests/cruft-ancient-libtool/debian/ltconfig b/t/tests/cruft-updated-libtool/debian/ltconfig
similarity index 100%
copy from t/tests/cruft-ancient-libtool/debian/ltconfig
copy to t/tests/cruft-updated-libtool/debian/ltconfig
diff --git a/t/tests/cruft-ancient-libtool/debian/ltmain.sh b/t/tests/cruft-updated-libtool/debian/ltmain.sh
similarity index 100%
copy from t/tests/cruft-ancient-libtool/debian/ltmain.sh
copy to t/tests/cruft-updated-libtool/debian/ltmain.sh
diff --git a/t/tests/cruft-updated-libtool/desc b/t/tests/cruft-updated-libtool/desc
new file mode 100644
index 0000000..0ef13f2
--- /dev/null
+++ b/t/tests/cruft-updated-libtool/desc
@@ -0,0 +1,6 @@
+Testname: cruft-updated-libtool
+Sequence: 6000
+Version: 1.0
+Description: Old ltmain.sh/ltconfig is fine with build-depend
+Test-Against: ancient-libtool
+References: Debian Bug#534134
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/cruft-updated-libtool/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/cruft-updated-libtool/tags

-- 
Debian package checker