[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.3-4-g95b1e8a



The following commit has been merged in the master branch:
commit 95b1e8aacddb35a5a7c3d36a12eadff1f98f0c83
Author: Russ Allbery <rra@debian.org>
Date:   Sun Feb 8 23:19:02 2009 -0800

    Use Lintian::Collect's relation method in checks/cruft

diff --git a/checks/cruft b/checks/cruft
index 1a92ed1..0f8ade8 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -25,7 +25,7 @@
 package Lintian::cruft;
 use strict;
 
-use Dep;
+use Lintian::Relation ();
 use Tags;
 use Util;
 
@@ -34,10 +34,13 @@ use File::Find;
 use File::Basename;
 
 # All the packages that may provide config.{sub,guess} during the build, used
-# to suppress warnings about outdated autotools helper files.
-my $autotools_pkgs = join ' | ',
+# to suppress warnings about outdated autotools helper files.  I'm not
+# thrilled with having the automake exception as well, but people do depend on
+# autoconf and automake and then use autoreconf to update config.guess and
+# config.sub, and automake depends on autotools-dev.
+our $AUTOTOOLS = Lintian::Relation->new(join(' | ',
     qw(autotools-dev automake automaken automake1.4 automake1.7 automake1.8
-       automake1.9 automake1.10);
+       automake1.9 automake1.10)));
 
 # Directory checks.  These regexes match a directory that shouldn't be in the
 # source package and associate it with a tag (minus the leading
@@ -104,14 +107,7 @@ if (defined $info->field('architecture')) {
 }
 
 # Read build-depends file and see if it depends on autotools-dev or automake.
-# I'm not thrilled with having the automake exception as well, but people do
-# depend on autoconf and automake and then use autoreconf to update
-# config.guess and config.sub, and automake depends on autotools-dev.
-my $atdinbd = 0;
-if (defined $info->field('build-depends')) {
-    my $bd = $info->field('build-depends');
-    $atdinbd = 1 if Dep::implies(Dep::parse($bd), Dep::parse($autotools_pkgs));
-}
+my $atdinbd = $info->relation('build-depends')->implies($AUTOTOOLS);
 
 # 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
diff --git a/debian/changelog b/debian/changelog
index 91e73a4..9a10ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ lintian (2.2.4) UNRELEASED; urgency=low
     + [RA] Use Lintian::Relation instead of Dep.
   * checks/copyright-file:
     + [RA] Use Lintian::Collect for dependency information.
+  * checks/cruft:
+    + [RA] Use Lintian::Collect for dependency information.
 
  -- Russ Allbery <rra@debian.org>  Sun, 08 Feb 2009 22:06:34 -0800
 

-- 
Debian package checker


Reply to: