[SCM] Debian package checker branch, master, updated. 2.5.3-30-g51db711

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 51db711beb96667b02ed1d552a41a93b79cbd68e
Author: Jakub Wilk <jwilk@debian.org>
Date:   Mon Sep 26 21:43:58 2011 +0200

    Merge common_data.pm into Lintian::Check
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/common_data.pm b/checks/common_data.pm
deleted file mode 100644
index 5096147..0000000
--- a/checks/common_data.pm
+++ /dev/null
@@ -1,29 +0,0 @@
-package common_data;
-
-use strict;
-use warnings;
-
-use base qw(Exporter);
-
-our @EXPORT = qw
-(
-   $known_shells_regex
-);
-
-# To let "perl -cw" test know we use these variables;
-use vars qw
-(
-  $known_shells_regex
-);
-
-# simple defines for commonly needed data
-
-$known_shells_regex = qr'(?:[bd]?a|t?c|(?:pd|m)?k|z)?sh';
-
-1;
-
-# Local Variables:
-# indent-tabs-mode: nil
-# cperl-indent-level: 4
-# End:
-# vim: syntax=perl sw=4 sts=4 ts=4 et shiftround
diff --git a/checks/menus b/checks/menus
index a565945..805452e 100644
--- a/checks/menus
+++ b/checks/menus
@@ -23,10 +23,7 @@
 package Lintian::menus;
 use strict;
 
-use lib "$ENV{'LINTIAN_ROOT'}/checks/";
-use common_data;
-
-use Lintian::Check qw(check_spelling check_spelling_picky);
+use Lintian::Check qw(check_spelling check_spelling_picky $known_shells_regex);
 use Lintian::Data;
 use Lintian::Tags qw(tag);
 use Util;
diff --git a/checks/scripts b/checks/scripts
index 6e36b5a..8fb4893 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -26,11 +26,9 @@ package Lintian::scripts;
 use strict;
 use warnings;
 
-use lib "$ENV{'LINTIAN_ROOT'}/checks/";
-use common_data;
-
 use Util;
 
+use Lintian::Check qw($known_shells_regex);
 use Lintian::Relation;
 use Lintian::Tags qw(tag);
 
diff --git a/debian/changelog b/debian/changelog
index c356e8b..2730722 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 lintian (2.5.4) UNRELEASED; urgency=low
 
+  * checks/*:
+    + [JW] Replace common_data.pm with Lintian::Check.
   * checks/binaries:
     + [JW] Allow binaries to use "/usr/lib/$srcpkg/" in RPATHs.
       (Closes: #642092)
+  * checks/common_data.pm:
+    + [JW] Merged into Lintian::Check.
   * checks/cruft:
     + [NT] Escape path when using them in regexes.  (Closes: #642902)
   * checks/dehelper:
@@ -29,6 +33,8 @@ lintian (2.5.4) UNRELEASED; urgency=low
       than verbose.
     + [JW,NT] Correctly handle $TMPDIR not being an absolute path.
       (Closes: #642113)
+  * lib/Lintian/Check.pm:
+    + [JW] Merged with common_data.pm.
   * lib/Lintian/Collect/Source.pm:
     + [JW] Fixed call to binary_field in binary_relation.
       (Closes: #641609)
diff --git a/lib/Lintian/Check.pm b/lib/Lintian/Check.pm
index 4cf9424..2dd1287 100644
--- a/lib/Lintian/Check.pm
+++ b/lib/Lintian/Check.pm
@@ -29,7 +29,7 @@ use Lintian::Data;
 use Lintian::Tags qw(tag);
 
 our @ISA    = qw(Exporter);
-our @EXPORT = qw(check_maintainer check_spelling check_spelling_picky);
+our @EXPORT = qw(check_maintainer check_spelling check_spelling_picky $known_shells_regex);
 
 =head1 NAME
 
@@ -308,6 +308,20 @@ sub check_spelling_picky {
 
 =back
 
+=head1 VARIABLES
+
+=over 4
+
+=item $known_shells_regex
+
+Regular expression that maches names of any known shell.
+
+=cut
+
+our $known_shells_regex = qr'(?:[bd]?a|t?c|(?:pd|m)?k|z)?sh';
+
+=back
+
 =head1 AUTHOR
 
 Originally written by Russ Allbery <rra@debian.org> for Lintian.  Based on

-- 
Debian package checker