[SCM] Debian package checker branch, master, updated. 2.5.10-124-ged518ac
The following commit has been merged in the master branch:
commit 6577f876ae55421109fd016def4f50d6eea45dd8
Author: Niels Thykier <niels@thykier.net>
Date: Mon Sep 3 10:47:57 2012 +0200
L::Check: Move $PKGNAME_REGEX to L::Util
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/fields b/checks/fields
index 7a46964..2f537f3 100644
--- a/checks/fields
+++ b/checks/fields
@@ -30,10 +30,11 @@ use Dpkg::Version qw(version_check);
use Lintian::Architecture qw(:all);
use Lintian::Data ();
-use Lintian::Check qw(check_maintainer $PKGNAME_REGEX);
+use Lintian::Check qw(check_maintainer);
use Lintian::Relation ();
use Lintian::Relation::Version qw(versions_compare);
use Lintian::Tags qw(tag);
+use Lintian::Util qw($PKGNAME_REGEX);
our $KNOWN_ESSENTIAL = Lintian::Data->new('fields/essential');
our $KNOWN_METAPACKAGES = Lintian::Data->new('fields/metapackages');
diff --git a/checks/init.d b/checks/init.d
index 0eeb337..83c76ea 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -22,10 +22,9 @@ package Lintian::init_d;
use strict;
use warnings;
-use Lintian::Check qw($PKGNAME_REGEX);
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Lintian::Util qw(fail);
+use Lintian::Util qw(fail $PKGNAME_REGEX);
# A list of valid LSB keywords. The value is 0 if optional and 1 if required.
my %lsb_keywords = (provides => 1,
diff --git a/debian/changelog b/debian/changelog
index fa04d77..1addd29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -290,8 +290,6 @@ lintian (2.5.9) unstable; urgency=low
no packages are given and debian/changelog exists. Thanks
to Gilles Filippini for the suggestion. (Closes: #676799)
- * lib/Lintian/Check.pm:
- + [NT] Add regex to match valid package names.
* lib/Lintian/Collect/Package.pm:
+ [NT] sorted_index now returns a list rather than a list ref.
+ [NT] Represent files (from index) as Lintian::Path objects.
@@ -303,6 +301,8 @@ lintian (2.5.9) unstable; urgency=low
+ [NT] Gracefully handle the absence of $ENV{HOME}.
* lib/Lintian/Path.pm:
+ [NT] New file.
+ * lib/Lintian/Util.pm:
+ + [NT] Add regex to match valid package names.
-- Niels Thykier <niels@thykier.net> Fri, 15 Jun 2012 21:29:03 +0200
diff --git a/lib/Lintian/Check.pm b/lib/Lintian/Check.pm
index 7a04859..7c49467 100644
--- a/lib/Lintian/Check.pm
+++ b/lib/Lintian/Check.pm
@@ -31,8 +31,8 @@ use Lintian::Tags qw(tag);
our $KNOWN_BOUNCE_ADDRESSES = Lintian::Data->new('fields/bounce-addresses');
our @ISA = qw(Exporter);
-our @EXPORT = qw(check_maintainer check_spelling check_spelling_picky $known_shells_regex
- $PKGNAME_REGEX
+our @EXPORT = qw(check_maintainer check_spelling check_spelling_picky
+ $known_shells_regex
);
@@ -345,15 +345,6 @@ Regular expression that matches names of any known shell.
our $known_shells_regex = qr'(?:[bd]?a|t?c|(?:pd|m)?k|z)?sh';
-=item $PKGNAME_REGEX
-
-Regular expressions that matches valid package names. The regression is
-not anchored and does not enforce any "boundry" characters.
-
-=cut
-
-our $PKGNAME_REGEX = qr/[a-z0-9][-+\.a-z0-9]+/o;
-
=back
=head1 AUTHOR
diff --git a/lib/Lintian/Util.pm b/lib/Lintian/Util.pm
index 38c385d..61437f7 100644
--- a/lib/Lintian/Util.pm
+++ b/lib/Lintian/Util.pm
@@ -64,7 +64,8 @@ BEGIN {
perm2oct
check_path
clean_env
- resolve_pkg_path),
+ resolve_pkg_path
+ $PKGNAME_REGEX),
@{ $EXPORT_TAGS{constants} }
);
@@ -175,6 +176,21 @@ file is considered a syntax error.
=back
+=head1 VARIABLES
+
+=over 4
+
+=item $PKGNAME_REGEX
+
+Regular expressions that matches valid package names. The regression is
+not anchored and does not enforce any "boundry" characters.
+
+=cut
+
+our $PKGNAME_REGEX = qr/[a-z0-9][-+\.a-z0-9]+/o;
+
+=back
+
=head1 FUNCTIONS
=over 4
--
Debian package checker
Reply to: