[SCM] Debian package checker branch, master, updated. 2.5.6-77-g4231e59
The following commit has been merged in the master branch:
commit 4231e5972919e67d9708c20358d40ef308c79254
Author: Niels Thykier <niels@thykier.net>
Date: Fri Apr 6 14:12:09 2012 +0200
Rename Util to Lintian::Util
Limit the Lintian::Util imports, where these were trivial to check.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/binaries b/checks/binaries
index 9cb307a..0fc426f 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -23,10 +23,10 @@ package Lintian::binaries;
use strict;
use warnings;
-use Util;
use Lintian::Check qw(check_spelling);
use Lintian::Tags qw(tag);
use Lintian::Output qw(debug_msg);
+use Lintian::Util qw(fail slurp_entire_file);
use File::Spec;
diff --git a/checks/changelog-file b/checks/changelog-file
index 0c50c5e..628b75e 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -25,7 +25,7 @@ use warnings;
use Lintian::Relation::Version qw(versions_gt);
use Lintian::Tags qw(tag);
use Lintian::Check qw(check_spelling);
-use Util;
+use Lintian::Util qw(fail file_is_encoded_in_non_utf8);
use Encode qw(decode);
use Parse::DebianChangelog;
diff --git a/checks/changes-file b/checks/changes-file
index ddbdd37..919dd2b 100644
--- a/checks/changes-file
+++ b/checks/changes-file
@@ -22,9 +22,9 @@ package Lintian::changes_file;
use strict;
use warnings;
-use Util;
use Lintian::Tags qw(tag);
use Lintian::Check qw(check_maintainer);
+use Lintian::Util qw(get_file_checksum);
my $KNOWN_DISTS = Lintian::Data->new ('changes-file/known-dists');
diff --git a/checks/conffiles b/checks/conffiles
index 6dab249..0da3432 100644
--- a/checks/conffiles
+++ b/checks/conffiles
@@ -23,8 +23,8 @@ package Lintian::conffiles;
use strict;
use warnings;
-use Util;
use Lintian::Tags qw(tag);
+use Lintian::Util qw(fail);
sub run {
diff --git a/checks/control-file b/checks/control-file
index 61061d0..5a87c6d 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -25,7 +25,7 @@ use warnings;
use Lintian::Data ();
use Lintian::Relation ();
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail file_is_encoded_in_non_utf8 read_dpkg_control);
# The list of libc packages, used for checking for a hard-coded dependency
# rather than using ${shlibs:Depends}.
diff --git a/checks/control-files b/checks/control-files
index 145351e..6a570fc 100644
--- a/checks/control-files
+++ b/checks/control-files
@@ -22,7 +22,6 @@ package Lintian::control_files;
use strict;
use warnings;
-use Util;
use Lintian::Tags qw(tag);
sub octify {
diff --git a/checks/copyright-file b/checks/copyright-file
index 4ff3c50..c9944f6 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -25,7 +25,7 @@ use warnings;
use Lintian::Check qw(check_spelling);
use Lintian::Data ();
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail slurp_entire_file file_is_encoded_in_non_utf8);
use Encode qw(decode);
diff --git a/checks/cruft b/checks/cruft
index fa0eaec..c97901e 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -29,7 +29,7 @@ use warnings;
use Lintian::Data;
use Lintian::Relation ();
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail);
use Cwd;
use File::Find;
@@ -363,7 +363,7 @@ sub find_cruft {
}
} elsif ($name =~ m,^(.+/)?config.(?:guess|sub)$, and not $atdinbd) {
my $b = basename $name;
- open (F, '<', $b) or die "can't open $name: $!";
+ open F, '<', $b or fail "can't open $name: $!";
while (<F>) {
last if $. > 10; # it's on the 6th line, but be a bit more lenient
if (/^(?:timestamp|version)='((\d+)-(\d+).*)'$/) {
@@ -380,7 +380,7 @@ sub find_cruft {
tag 'ancient-libtool', $name;
} elsif ($name =~ m,^(.+/)?ltmain\.sh$, and not $ltinbd) {
my $b = basename $name;
- open (F, '<', $b) or die "can't open $name: $!";
+ open F, '<', $b or fail "can't open $name: $!";
while (<F>) {
if (/^VERSION=[\"\']?(1\.(\d)\.(\d+)(?:-(\d))?)/) {
my ($version, $major, $minor, $debian) = ($1, $2, $3, $4);
diff --git a/checks/debconf b/checks/debconf
index 7669ceb..fdcebb0 100644
--- a/checks/debconf
+++ b/checks/debconf
@@ -24,7 +24,7 @@ use warnings;
use Lintian::Relation;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail read_dpkg_control);
# From debconf-devel(7), section 'THE TEMPLATES FILE', up to date with debconf
# version 1.5.24. Added indices for cdebconf (indicates sort order for
diff --git a/checks/debhelper b/checks/debhelper
index ed93652..703b4a1 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -22,9 +22,9 @@ package Lintian::debhelper;
use strict;
use warnings;
-use Util;
use Lintian::Data;
use Lintian::Tags qw(tag);
+use Lintian::Util qw(fail slurp_entire_file);
# If compat is less than or equal to this, then a missing version
# for this level is only a pedantic issue.
diff --git a/checks/debian-source-dir b/checks/debian-source-dir
index b729c7e..b797c12 100644
--- a/checks/debian-source-dir
+++ b/checks/debian-source-dir
@@ -24,7 +24,7 @@ use warnings;
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail);
our %KNOWN_FORMATS = map { $_ => 1 }
('1.0', '2.0', '3.0 (quilt)', '3.0 (native)', '3.0 (git)', '3.0 (bzr)');
diff --git a/checks/description b/checks/description
index 657f802..95a66e9 100644
--- a/checks/description
+++ b/checks/description
@@ -26,7 +26,6 @@ use Encode qw(decode);
use Lintian::Check qw(check_spelling check_spelling_picky);
use Lintian::Tags qw(tag);
-use Util;
sub run {
diff --git a/checks/duplicate-files b/checks/duplicate-files
index beb4d59..a4e15d0 100644
--- a/checks/duplicate-files
+++ b/checks/duplicate-files
@@ -23,7 +23,6 @@ use strict;
use warnings;
use Lintian::Tags qw(tag);
-use Util;
sub run {
diff --git a/checks/fields b/checks/fields
index 542c56c..39d9b3e 100644
--- a/checks/fields
+++ b/checks/fields
@@ -28,8 +28,6 @@ use warnings;
use Dpkg::Version qw(version_check);
-use Util;
-
use Lintian::Architecture qw(:all);
use Lintian::Data ();
use Lintian::Check qw(check_maintainer);
diff --git a/checks/files b/checks/files
index 8bd3bb6..38e70a2 100644
--- a/checks/files
+++ b/checks/files
@@ -26,7 +26,7 @@ use File::Basename;
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util;
my $FONT_PACKAGES = Lintian::Data->new ('files/fonts', qr/\s++/);
my $TRIPLETS = Lintian::Data->new ('files/triplets', qr/\s++/);
diff --git a/checks/infofiles b/checks/infofiles
index 2e5f016..6755fbd 100644
--- a/checks/infofiles
+++ b/checks/infofiles
@@ -24,7 +24,7 @@ use strict;
use warnings;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(clean_env fail);
use File::Basename qw(fileparse);
diff --git a/checks/init.d b/checks/init.d
index 242a838..d3f29dd 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -20,8 +20,10 @@
package Lintian::init_d;
use strict;
-use Util;
+use warnings;
+
use Lintian::Tags qw(tag);
+use Lintian::Util qw(fail);
# A list of valid LSB keywords. The value is 0 if optional and 1 if required.
my %lsb_keywords = (provides => 1,
diff --git a/checks/java b/checks/java
index b290a1b..2f8a893 100644
--- a/checks/java
+++ b/checks/java
@@ -23,7 +23,7 @@ use strict;
use warnings;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(resolve_pkg_path);
sub run {
diff --git a/checks/manpages b/checks/manpages
index 9fb3f57..ade6260 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -22,9 +22,10 @@ package Lintian::manpages;
use strict;
use warnings;
-use Util;
use Lintian::Check qw(check_spelling);
use Lintian::Tags qw(tag);
+use Lintian::Util qw(clean_env fail);
+
use Text::ParseWords ();
use File::Basename;
diff --git a/checks/md5sums b/checks/md5sums
index 1d78f0f..1538e31 100644
--- a/checks/md5sums
+++ b/checks/md5sums
@@ -23,7 +23,7 @@ use strict;
use warnings;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail);
sub run {
diff --git a/checks/menu-format b/checks/menu-format
index b67c1a2..c52a3ff 100644
--- a/checks/menu-format
+++ b/checks/menu-format
@@ -37,7 +37,7 @@ use strict;
use warnings;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util;
use File::Basename;
diff --git a/checks/menus b/checks/menus
index 6f2611e..b54baba 100644
--- a/checks/menus
+++ b/checks/menus
@@ -22,11 +22,12 @@
package Lintian::menus;
use strict;
+use warnings;
use Lintian::Check qw(check_spelling check_spelling_picky $known_shells_regex);
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util;
# Supported documentation formats for doc-base files.
our %known_doc_base_formats = map { $_ => 1 }
diff --git a/checks/nmu b/checks/nmu
index 4981b35..56bf135 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -24,7 +24,6 @@ use warnings;
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Util;
sub run {
diff --git a/checks/ocaml b/checks/ocaml
index bcf56d7..f852ec8 100644
--- a/checks/ocaml
+++ b/checks/ocaml
@@ -25,8 +25,9 @@ use warnings;
use File::Basename;
use Lintian::Collect::Binary ();
-use Lintian::Tags qw(tag);
use Lintian::Relation ();
+use Lintian::Tags qw(tag);
+use Lintian::Util qw(fail);
# The maximum number of *.cmi files to show individually.
our $MAX_CMI = 3;
@@ -39,7 +40,7 @@ my $info = shift;
# Collect information about .a files from ar-info dump
my %provided_o;
-open ARINFO, '<', 'ar-info';
+open ARINFO, '<', 'ar-info' or fail "opening ar-info: $!";
while (<ARINFO>) {
chomp;
if (/^(?:\.\/)?([^:]+): (.*)$/) {
diff --git a/checks/patch-systems b/checks/patch-systems
index 0845a69..14d0613 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -21,9 +21,10 @@
package Lintian::patch_systems;
use strict;
+use warnings;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util;
use Cwd qw(realpath);
sub run {
diff --git a/checks/po-debconf b/checks/po-debconf
index 423bfa3..e665fc4 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -22,8 +22,8 @@ package Lintian::po_debconf;
use strict;
use warnings;
-use Util;
use Lintian::Tags qw(tag);
+use Lintian::Util;
sub run {
diff --git a/checks/rules b/checks/rules
index b41acbb..f3fa3b2 100644
--- a/checks/rules
+++ b/checks/rules
@@ -17,9 +17,9 @@ package Lintian::rules;
use strict;
use warnings;
-use Util;
use Lintian::Data;
use Lintian::Tags qw(tag);
+use Lintian::Util;
our $PYTHON_DEPEND = 'python | python-dev | python-all | python-all-dev';
our $PYTHON3_DEPEND = 'python3 | python3-dev | python3-all | python3-all-dev';
diff --git a/checks/scripts b/checks/scripts
index 04edafa..c95e6d2 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -26,12 +26,11 @@ package Lintian::scripts;
use strict;
use warnings;
-use Util;
-
use Lintian::Check qw($known_shells_regex);
use Lintian::Data;
use Lintian::Relation;
use Lintian::Tags qw(tag);
+use Lintian::Util;
sub _parse_interpreters {
my ($interpreter, $value) = @_;
diff --git a/checks/shared-libs b/checks/shared-libs
index f954f66..089d436 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -27,7 +27,7 @@ use File::Basename;
use Lintian::Data;
use Lintian::Relation;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util;
# Libraries that should only be used in the presence of certain capabilities
# may be located in subdirectories of the standard ldconfig search path with
diff --git a/checks/source-copyright b/checks/source-copyright
index 2e589ce..969781d 100644
--- a/checks/source-copyright
+++ b/checks/source-copyright
@@ -25,7 +25,7 @@ use warnings;
use Lintian::Relation::Version qw(versions_compare);
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(read_dpkg_control slurp_entire_file);
my $dep5_last_normative_change = '0+svn~166';
my $dep5_last_overhaul = '0+svn~148';
diff --git a/checks/standards-version b/checks/standards-version
index 343c24e..10abb34 100644
--- a/checks/standards-version
+++ b/checks/standards-version
@@ -29,7 +29,7 @@ use Date::Parse qw(str2time);
use Lintian::Data;
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(fail);
# Any Standards Version released before this day is "ancient"
my $ANCIENT_DATE = str2time('24 Mar 2010') or fail "Cannot parse ANCIENT_DATE: $!";
diff --git a/checks/symlinks b/checks/symlinks
index 80f1e3a..7591e97 100644
--- a/checks/symlinks
+++ b/checks/symlinks
@@ -24,7 +24,7 @@ use warnings;
use File::Basename qw(dirname);
use Lintian::Tags qw(tag);
-use Util;
+use Lintian::Util qw(resolve_pkg_path);
sub run {
diff --git a/checks/version-substvars b/checks/version-substvars
index 9eb3b5e..e1d1ec0 100644
--- a/checks/version-substvars
+++ b/checks/version-substvars
@@ -38,7 +38,6 @@ package Lintian::version_substvars;
use strict;
use warnings;
-use Util;
use Lintian::Tags qw(tag);
sub run {
diff --git a/checks/watch-file b/checks/watch-file
index 1983ca4..7f1d26b 100644
--- a/checks/watch-file
+++ b/checks/watch-file
@@ -27,6 +27,8 @@ use warnings;
use Lintian::Collect;
use Lintian::Tags qw(tag);
+use Lintian::Util qw(fail);
+
sub run {
my $pkg = shift;
diff --git a/collection/ar-info b/collection/ar-info
index 0a0c864..e12195f 100755
--- a/collection/ar-info
+++ b/collection/ar-info
@@ -26,7 +26,7 @@ use lib "$ENV{LINTIAN_ROOT}/lib";
use FileHandle;
use Lintian::Collect;
use Lintian::Command qw(spawn);
-use Util qw(fail);
+use Lintian::Util qw(fail);
($#ARGV == 2) or fail 'syntax: ar-info <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/bin-pkg-control b/collection/bin-pkg-control
index 53c1be1..a68a9a4 100755
--- a/collection/bin-pkg-control
+++ b/collection/bin-pkg-control
@@ -23,8 +23,8 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
use Lintian::Command qw(spawn reap);
+use Lintian::Util qw(fail);
($#ARGV == 2) or fail 'syntax: bin-pkg-control <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/changelog-file b/collection/changelog-file
index a092306..ade55c1 100755
--- a/collection/changelog-file
+++ b/collection/changelog-file
@@ -23,7 +23,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(fail gunzip_file);
($#ARGV == 2) or fail('syntax: changelog-file <pkg> <type> <dir>');
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/copyright-file b/collection/copyright-file
index 7bb8c39..afcb04e 100755
--- a/collection/copyright-file
+++ b/collection/copyright-file
@@ -23,7 +23,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(fail gunzip_file touch_file);
use File::Copy qw(copy);
diff --git a/collection/debfiles b/collection/debfiles
index 42f48e1..48d25f8 100755
--- a/collection/debfiles
+++ b/collection/debfiles
@@ -24,7 +24,7 @@ use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(copy_dir delete_dir fail);
($#ARGV == 2) or fail 'syntax: debfiles <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/debian-readme b/collection/debian-readme
index afef8a3..177dc38 100755
--- a/collection/debian-readme
+++ b/collection/debian-readme
@@ -23,7 +23,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(fail gunzip_file touch_file);
($#ARGV == 2) or fail 'syntax: debian-readme <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/diffstat b/collection/diffstat
index 62d9798..31a313b 100755
--- a/collection/diffstat
+++ b/collection/diffstat
@@ -29,7 +29,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(fail get_dsc_info gunzip_file);
($#ARGV == 2) or fail 'syntax: diffstat <pkg> <type> <dir>';
my ($pkg, undef, $dir) = @ARGV;
diff --git a/collection/doc-base-files b/collection/doc-base-files
index a68b1c5..d9aeec1 100755
--- a/collection/doc-base-files
+++ b/collection/doc-base-files
@@ -24,7 +24,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(copy_dir delete_dir fail);
($#ARGV == 2) or fail 'syntax: doc-base-files <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/file-info b/collection/file-info
index dd1c803..ab5436a 100755
--- a/collection/file-info
+++ b/collection/file-info
@@ -25,9 +25,9 @@ use warnings;
use Cwd qw(realpath);
use FileHandle;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
use Lintian::Collect;
use Lintian::Command qw(spawn reap);
+use Lintian::Util qw(fail);
($#ARGV == 2) or fail 'syntax: file-info <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/hardening-info b/collection/hardening-info
index b7408be..46284a3 100755
--- a/collection/hardening-info
+++ b/collection/hardening-info
@@ -30,8 +30,8 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
use Lintian::Collect;
+use Lintian::Util qw(fail);
my ($pkg, $type, $dir) = @ARGV;
my $info = Lintian::Collect->new ($pkg, $type, $dir);
diff --git a/collection/index b/collection/index
index f2cc24c..348f3db 100755
--- a/collection/index
+++ b/collection/index
@@ -30,9 +30,9 @@ use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Cwd();
use File::Spec;
-use Util;
use Lintian::Command qw(spawn reap);
use Lintian::Processable::Package;
+use Lintian::Util qw(fail get_dsc_info);
($#ARGV == 2) or fail 'syntax: index <pkg> <type> <dir>';
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/init.d b/collection/init.d
index 370e3c8..ddc27d2 100755
--- a/collection/init.d
+++ b/collection/init.d
@@ -23,7 +23,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(copy_dir delete_dir fail);
($#ARGV == 2) or fail('syntax: init.d <pkg> <type> <dir>');
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/java-info b/collection/java-info
index a713c70..002c5b4 100755
--- a/collection/java-info
+++ b/collection/java-info
@@ -24,7 +24,7 @@ use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib/";
use Lintian::Collect;
-use Util qw(fail);
+use Lintian::Util qw(fail);
my ($pkg, $type, $dir) = @ARGV;
my $info = Lintian::Collect->new ($pkg, $type, $dir);
diff --git a/collection/md5sums b/collection/md5sums
index b2f110f..7d9b4d2 100755
--- a/collection/md5sums
+++ b/collection/md5sums
@@ -26,7 +26,7 @@ use FileHandle;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Lintian::Collect;
use Lintian::Command qw(spawn reap);
-use Util;
+use Lintian::Util qw(fail);
($#ARGV == 2) or fail 'syntax: md5sums <pkg> <type> <dir>';
diff --git a/collection/menu-files b/collection/menu-files
index 865fb25..15fc69a 100755
--- a/collection/menu-files
+++ b/collection/menu-files
@@ -23,7 +23,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(copy_dir delete_dir fail);
($#ARGV == 2) or fail('syntax: menu-files <pkg> <type> <dir>');
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/objdump-info b/collection/objdump-info
index bf16843..d82e31c 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -28,7 +28,7 @@ use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib/";
use Lintian::Collect;
-use Util qw(fail);
+use Lintian::Util qw(fail);
my ($pkg, $type, $dir) = @ARGV;
my $info = Lintian::Collect->new ($pkg, $type, $dir);
diff --git a/collection/override-file b/collection/override-file
index 94578cf..2256267 100755
--- a/collection/override-file
+++ b/collection/override-file
@@ -24,7 +24,7 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util qw(fail gunzip_file);
($#ARGV == 2) or fail('syntax: override-file <pkg> <type> <dir>');
my ($pkg, $type, $dir) = @ARGV;
diff --git a/collection/scripts b/collection/scripts
index 12512bf..8c6fbcb 100755
--- a/collection/scripts
+++ b/collection/scripts
@@ -24,7 +24,7 @@ use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib/";
use Lintian::Collect;
-use Util qw(fail);
+use Lintian::Util qw(fail);
my ($pkg, $type, $dir) = @ARGV;
my $info = Lintian::Collect->new ($pkg, $type, $dir);
diff --git a/collection/strings b/collection/strings
index ebb64cc..a93d61a 100755
--- a/collection/strings
+++ b/collection/strings
@@ -23,10 +23,10 @@ use strict;
use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
use Lintian::Collect;
use Lintian::Command qw(spawn);
use Lintian::Command::Simple;
+use Lintian::Util qw(delete_dir fail);
($#ARGV == 2) or fail('syntax: strings <pkg> <type> <dir>');
diff --git a/collection/unpacked b/collection/unpacked
index 9b361d6..87e0203 100755
--- a/collection/unpacked
+++ b/collection/unpacked
@@ -25,7 +25,7 @@ use warnings;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Lintian::Command qw(spawn);
-use Util;
+use Lintian::Util qw(check_path delete_dir fail);
($#ARGV == 2) or fail('syntax: unpacked <package> <type> <dir>');
my ($pkg, $type, $dir) = @ARGV;
diff --git a/debian/changelog b/debian/changelog
index c017848..76d28ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,8 +93,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
* collection/index{,.desc}:
+ [NT] Compress index output and bump version of index.
* collection/objdump-info:
- + [NT] Use "fail" from Util.pm rather than embedding a copy of
- it.
+ + [NT] Use "fail" from Lintian::Util.pm rather than embedding a
+ copy of it.
+ [NT] Use Lintian::Collect to find ELF files.
+ [NT] Replace all usage of objdump with readelf.
(Closes: #614034)
@@ -142,7 +142,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
file instead using an ad-hoc parser.
* lib/{Text_utils => Lintian/Tag/TextUtil}.pm:
+ [NT] Renamed module.
- * lib/Util.pm:
+ * lib/{Util => Lintian/Util}.pm:
+ + [NT] Renamed Util to Lintian::Util.
+ [JW] Consider duplicate fields a syntax error in dctrl files.
Previously, duplicate fields were silently ignored (except
when a separate tag would check for it). (Closes: #664061)
diff --git a/frontend/lintian b/frontend/lintian
index 56fb402..4725e21 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -752,8 +752,8 @@ unshift @INC, "$opt{'LINTIAN_ROOT'}/lib";
require Lintian::Lab;
-require Util;
-import Util;
+require Lintian::Util;
+import Lintian::Util;
require Lintian::Collect;
require Lintian::DepMap::Properties;
diff --git a/lib/Lintian/CheckScript.pm b/lib/Lintian/CheckScript.pm
index 3cc5237..196d8de 100644
--- a/lib/Lintian/CheckScript.pm
+++ b/lib/Lintian/CheckScript.pm
@@ -21,11 +21,12 @@ package Lintian::CheckScript;
use strict;
use warnings;
-use Util qw(read_dpkg_control);
use base 'Class::Accessor';
use Carp qw(croak);
+
use Lintian::Tag::Info ();
+use Lintian::Util qw(read_dpkg_control);
=head1 NAME
diff --git a/lib/Lintian/Collect.pm b/lib/Lintian/Collect.pm
index 4bfddb8..8e0a340 100644
--- a/lib/Lintian/Collect.pm
+++ b/lib/Lintian/Collect.pm
@@ -20,7 +20,7 @@ package Lintian::Collect;
use strict;
use warnings;
-use Util qw(get_dsc_info get_deb_info);
+use Lintian::Util qw(get_dsc_info get_deb_info);
use Carp qw(croak);
# Take the package name and type, initialize an appropriate collect object
diff --git a/lib/Lintian/Collect/Binary.pm b/lib/Lintian/Collect/Binary.pm
index 11f18b4..4dff890 100644
--- a/lib/Lintian/Collect/Binary.pm
+++ b/lib/Lintian/Collect/Binary.pm
@@ -28,7 +28,7 @@ use Lintian::Relation;
use Carp qw(croak);
use Parse::DebianChangelog;
-use Util;
+use Lintian::Util qw(fail);
# Initialize a new binary package collect object. Takes the package name,
# which is currently unused.
diff --git a/lib/Lintian/Collect/Package.pm b/lib/Lintian/Collect/Package.pm
index c543369..04a78f0 100644
--- a/lib/Lintian/Collect/Package.pm
+++ b/lib/Lintian/Collect/Package.pm
@@ -24,7 +24,7 @@ use warnings;
use base 'Lintian::Collect';
use Carp qw(croak);
-use Util qw(perm2oct);
+use Lintian::Util qw(perm2oct);
# Returns the path to the dir where the package is unpacked
# or a file therein (see pod below)
@@ -299,7 +299,7 @@ The following code may be helpful in checking for path traversal:
die "Possibly path traversal ($file)";
}
-Alternatively one can use Util::resolve_pkg_path.
+Alternatively one can use Lintian::Util::resolve_pkg_path.
=item file_info
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index 1f20644..c183c96 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -29,7 +29,7 @@ use Cwd();
use Lintian::Relation;
use Parse::DebianChangelog;
-use Util;
+use Lintian::Util;
# Initialize a new source package collect object. Takes the package name,
# which is currently unused.
diff --git a/lib/Lintian/Command.pm b/lib/Lintian/Command.pm
index 6453691..cdb6f26 100644
--- a/lib/Lintian/Command.pm
+++ b/lib/Lintian/Command.pm
@@ -231,21 +231,21 @@ sub spawn {
}
};
if ($@) {
- require Util;
- Util::fail($@) if $opts->{fail} ne 'never';
+ require Lintian::Util;
+ Lintian::Util::fail($@) if $opts->{fail} ne 'never';
$opts->{success} = 0;
$opts->{exception} = $@;
} elsif ($opts->{fail} eq 'error'
and not $opts->{success}) {
- require Util;
+ require Lintian::Util;
if ($opts->{description}) {
- Util::fail("$opts->{description} failed with error code ".
+ Lintian::Util::fail("$opts->{description} failed with error code ".
$opts->{harness}->result);
} elsif (@cmds == 1) {
- Util::fail("$cmds[0][0] failed with error code ".
+ Lintian::Util::fail("$cmds[0][0] failed with error code ".
$opts->{harness}->result);
} else {
- Util::fail('command failed with error code '.
+ Lintian::Util::fail('command failed with error code '.
$opts->{harness}->result);
}
}
@@ -292,18 +292,18 @@ sub reap {
$opts->{success} = $opts->{harness}->finish;
};
if ($@) {
- require Util;
- Util::fail($@) if $opts->{fail} ne 'never';
+ require Lintian::Util;
+ Lintian::Util::fail($@) if $opts->{fail} ne 'never';
$opts->{success} = 0;
$opts->{exception} = $@;
} elsif ($opts->{fail} eq 'error'
and not $opts->{success}) {
- require Util;
+ require Lintian::Util;
if ($opts->{description}) {
- Util::fail("$opts->{description} failed with error code ".
+ Lintian::Util::fail("$opts->{description} failed with error code ".
$opts->{harness}->result);
} else {
- Util::fail('command failed with error code '.
+ Lintian::Util::fail('command failed with error code '.
$opts->{harness}->result);
}
}
@@ -348,8 +348,8 @@ sub done {
if ($@ =~ m/process ended prematurely/) {
return 1;
} else {
- require Util;
- Util::fail("Unknown failure when trying to pump_nb: $@");
+ require Lintian::Util;
+ Lintian::Util::fail("Unknown failure when trying to pump_nb: $@");
}
}
diff --git a/lib/Lintian/Command/Simple.pm b/lib/Lintian/Command/Simple.pm
index 18bae46..5449328 100644
--- a/lib/Lintian/Command/Simple.pm
+++ b/lib/Lintian/Command/Simple.pm
@@ -460,7 +460,7 @@ __END__
Provide the necessary methods to modify the environment variables of
the to-be-executed commands. This would let us drop C<system_env> (from
-lib/Util.pm) and make C<run> more useful.
+Lintian::Util) and make C<run> more useful.
=head1 NOTES
diff --git a/lib/Lintian/DepMap.pm b/lib/Lintian/DepMap.pm
index 484aa91..167bdc4 100644
--- a/lib/Lintian/DepMap.pm
+++ b/lib/Lintian/DepMap.pm
@@ -17,7 +17,7 @@ package Lintian::DepMap;
use strict;
use warnings;
-use Util ();
+use Lintian::Util qw(fail);
=head1 NAME
@@ -209,11 +209,11 @@ sub satisfy {
my $node = shift;
if (grep {$_ eq $node} $self->missing()) {
- Util::fail("Attempted to mark node '$node' as satisfied but it is not ".
+ fail("Attempted to mark node '$node' as satisfied but it is not ".
'reachable, perhaps you forgot to add() it first?');
}
if (not exists($self->{'nodes'}{$node})) {
- Util::fail("Attempted to mark node '$node' as satisfied but it is not ".
+ fail("Attempted to mark node '$node' as satisfied but it is not ".
'reachable, perhaps you forgot to satisfy() its dependencies first?');
}
return 0 unless (exists($self->{'map'}{$node}));
@@ -294,7 +294,7 @@ sub unlink {
$soft = (defined($soft) && $soft eq 'soft');
if (not exists($self->{'nodes'}{$node})) {
- Util::fail("Attempted to unlink node '$node' but it can not be found".
+ fail("Attempted to unlink node '$node' but it can not be found".
', perhaps it has already been satisfied?');
}
@@ -346,7 +346,7 @@ sub select {
my $node = shift;
if (not exists($self->{'map'}{$node})) {
- Util::fail("Attempted to mark node '$node' as selected but it is not ".
+ fail("Attempted to mark node '$node' as selected but it is not ".
'known, perhaps its parents are not yet satisfied?');
}
return 0 if (exists($self->{'selected'}{$node}));
@@ -438,7 +438,7 @@ sub parents {
my $node = shift;
if (not exists($self->{'nodes'}{$node})) {
- Util::fail("Attempted to get the parents of node '$node' but it is not".
+ fail("Attempted to get the parents of node '$node' but it is not".
'known, perhaps you forgot to add() it first?');
}
diff --git a/lib/Lintian/Internal/FrontendUtil.pm b/lib/Lintian/Internal/FrontendUtil.pm
index 7ed8bf4..4b68faf 100644
--- a/lib/Lintian/Internal/FrontendUtil.pm
+++ b/lib/Lintian/Internal/FrontendUtil.pm
@@ -21,7 +21,7 @@ use strict;
use warnings;
use base qw(Exporter);
-use Util;
+use Lintian::Util;
our @EXPORT = qw(&check_test_feature &find_default_profile);
diff --git a/lib/Lintian/Lab.pm b/lib/Lintian/Lab.pm
index d5eca57..24ae8de 100644
--- a/lib/Lintian/Lab.pm
+++ b/lib/Lintian/Lab.pm
@@ -65,11 +65,10 @@ BEGIN {
);
};
-use Util qw(delete_dir get_dsc_info);
-
use Lintian::Collect;
use Lintian::Lab::Entry;
use Lintian::Lab::Manifest;
+use Lintian::Util qw(delete_dir get_dsc_info);
=encoding utf8
diff --git a/lib/Lintian/Lab/Entry.pm b/lib/Lintian/Lab/Entry.pm
index 2a9349c..3fe7453 100644
--- a/lib/Lintian/Lab/Entry.pm
+++ b/lib/Lintian/Lab/Entry.pm
@@ -65,8 +65,7 @@ use File::Spec;
use Cwd();
use Lintian::Lab;
-
-use Util qw(delete_dir read_dpkg_control get_dsc_info);
+use Lintian::Util qw(delete_dir read_dpkg_control get_dsc_info);
# This is the entry format version - this changes whenever the layout of
# entries changes. This differs from LAB_FORMAT in that LAB_FORMAT
diff --git a/lib/Lintian/Processable/Package.pm b/lib/Lintian/Processable/Package.pm
index 1484f39..661cc51 100644
--- a/lib/Lintian/Processable/Package.pm
+++ b/lib/Lintian/Processable/Package.pm
@@ -26,7 +26,7 @@ use warnings;
use Carp qw(croak);
-use Util qw(get_deb_info get_dsc_info);
+use Lintian::Util qw(get_deb_info get_dsc_info);
# Black listed characters - any match will be replaced with a _.
use constant EVIL_CHARACTERS => qr,[/&|;\$"'<>],o;
diff --git a/lib/Lintian/ProcessableGroup.pm b/lib/Lintian/ProcessableGroup.pm
index eef753f..bb4fde2 100644
--- a/lib/Lintian/ProcessableGroup.pm
+++ b/lib/Lintian/ProcessableGroup.pm
@@ -22,9 +22,9 @@ package Lintian::ProcessableGroup;
use strict;
use warnings;
-use Util;
use Lintian::Collect::Group;
use Lintian::Processable;
+use Lintian::Util;
=head1 NAME
diff --git a/lib/Lintian/ProcessablePool.pm b/lib/Lintian/ProcessablePool.pm
index e5f5c82..f25f683 100644
--- a/lib/Lintian/ProcessablePool.pm
+++ b/lib/Lintian/ProcessablePool.pm
@@ -25,7 +25,7 @@ use warnings;
use Carp qw(croak);
use Cwd();
-use Util;
+use Lintian::Util;
use Lintian::Processable::Package;
use Lintian::ProcessableGroup;
diff --git a/lib/Lintian/Profile.pm b/lib/Lintian/Profile.pm
index 8516d39..817b000 100644
--- a/lib/Lintian/Profile.pm
+++ b/lib/Lintian/Profile.pm
@@ -25,9 +25,9 @@ use strict;
use warnings;
use Carp qw(croak);
-use Util qw(read_dpkg_control);
use Lintian::CheckScript;
+use Lintian::Util qw(read_dpkg_control);
=head1 NAME
diff --git a/lib/Lintian/Tag/Info.pm b/lib/Lintian/Tag/Info.pm
index e50243d..bc8bff1 100644
--- a/lib/Lintian/Tag/Info.pm
+++ b/lib/Lintian/Tag/Info.pm
@@ -25,7 +25,7 @@ use warnings;
use Carp qw(croak);
use Lintian::Tag::TextUtil qw(dtml_to_html dtml_to_text split_paragraphs wrap_paragraphs);
-use Util qw(fail);
+use Lintian::Util qw(fail);
# The URL to a web man page service. NAME is replaced by the man page
# name and SECTION with the section to form a valid URL. This is used
diff --git a/lib/Lintian/Tag/TextUtil.pm b/lib/Lintian/Tag/TextUtil.pm
index 02e487a..058e010 100644
--- a/lib/Lintian/Tag/TextUtil.pm
+++ b/lib/Lintian/Tag/TextUtil.pm
@@ -30,8 +30,8 @@ our @EXPORT = qw(split_paragraphs wrap_paragraphs dtml_to_html dtml_to_text);
# requires wrap() function
use Text::Wrap;
-# requires fail() function
-use Util;
+
+use Lintian::Util qw(fail);
# html_wrap -- word-wrap a paragaph. The wrap() function from Text::Wrap
# is not suitable, because it chops words that are longer than the line
diff --git a/lib/Lintian/Tags.pm b/lib/Lintian/Tags.pm
index fb576d8..2317047 100644
--- a/lib/Lintian/Tags.pm
+++ b/lib/Lintian/Tags.pm
@@ -25,7 +25,7 @@ use warnings;
use Lintian::Architecture qw(:all);
use Lintian::Output;
use Lintian::Tag::Override;
-use Util qw(fail);
+use Lintian::Util qw(fail);
use base 'Exporter';
BEGIN {
diff --git a/lib/Util.pm b/lib/Lintian/Util.pm
similarity index 99%
rename from lib/Util.pm
rename to lib/Lintian/Util.pm
index 618afbd..c58db29 100644
--- a/lib/Util.pm
+++ b/lib/Lintian/Util.pm
@@ -1,5 +1,5 @@
# Hey emacs! This is a -*- Perl -*- script!
-# Util -- Perl utility functions for lintian
+# Lintian::Util -- Perl utility functions for lintian
# Copyright (C) 1998 Christian Schwarz
#
@@ -19,7 +19,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-package Util;
+package Lintian::Util;
use strict;
use warnings;
diff --git a/private/generate-lintian-pod b/private/generate-lintian-pod
index f712264..347f406 100755
--- a/private/generate-lintian-pod
+++ b/private/generate-lintian-pod
@@ -9,7 +9,7 @@ BEGIN {
}
use lib $ENV{LINTIAN_ROOT} . '/lib/';
-use Util qw(read_dpkg_control fail);
+use Lintian::Util qw(read_dpkg_control fail);
my @keywords = ();
diff --git a/private/generate-profiles.pl b/private/generate-profiles.pl
index 094f210..401c062 100755
--- a/private/generate-profiles.pl
+++ b/private/generate-profiles.pl
@@ -23,7 +23,7 @@ BEGIN {
}
use lib "$ENV{LINTIAN_ROOT}/lib";
-use Util;
+use Lintian::Util;
my $root = $ENV{LINTIAN_ROOT};
my @dirs = ('profiles/debian');
diff --git a/private/graph b/private/graph
index 87a104c..e9b8078 100755
--- a/private/graph
+++ b/private/graph
@@ -11,7 +11,7 @@ BEGIN {
}
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util;
my %opt = (
'checks' => 1,
diff --git a/private/refresh-archs b/private/refresh-archs
index ee75a0a..eb460be 100755
--- a/private/refresh-archs
+++ b/private/refresh-archs
@@ -25,7 +25,7 @@ use File::Temp qw(tempfile);
use POSIX qw (strftime);
use lib "$ENV{'LINTIAN_ROOT'}/lib/";
-use Util qw(parse_dpkg_control);
+use Lintian::Util qw(parse_dpkg_control);
my $datapath = shift;
my %hardening = map { $_ => 1 } qw(
diff --git a/private/tag-stats b/private/tag-stats
index b7e9988..c53e77e 100755
--- a/private/tag-stats
+++ b/private/tag-stats
@@ -25,7 +25,7 @@ my $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'};
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Lintian::Tag::Info;
-use Util;
+use Lintian::Util;
my @severities = reverse qw(pedantic wishlist minor normal important serious);
my @certainties = reverse qw(wild-guess possible certain);
diff --git a/private/update-coverage b/private/update-coverage
index d12545b..73b1c6b 100755
--- a/private/update-coverage
+++ b/private/update-coverage
@@ -26,7 +26,7 @@ BEGIN {
my $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'};
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util;
# Check that we're being run from the right place (although the above probably
# died if we weren't).
diff --git a/reporting/harness b/reporting/harness
index 35213af..2c8b700 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -98,10 +98,10 @@ $ENV{'LINTIAN_ARCH'} = $LINTIAN_ARCH;
# import perl libraries
unshift @INC, "$LINTIAN_ROOT/lib";
-require Util;
require Lintian::Lab;
require Lintian::Lab::Manifest;
require Lintian::Processable::Package;
+require Lintian::Util;
# turn file buffering off
$| = 1;
@@ -426,14 +426,14 @@ sub local_mirror_manifests {
my $binsub = sub { _parse_pkgs_pg ($active_srcs, $binman, $mirdir, $area, @_) };
my $upkgfd = _open_data_file ($upkgs);
my $udebsub = sub { _parse_pkgs_pg ($active_srcs, $udebman, $mirdir, $area, @_) };
- Util::_parse_dpkg_control_iterative ($binsub, $pkgfd);
- Util::_parse_dpkg_control_iterative ($udebsub, $upkgfd);
+ Lintian::Util::_parse_dpkg_control_iterative ($binsub, $pkgfd);
+ Lintian::Util::_parse_dpkg_control_iterative ($udebsub, $upkgfd);
close $pkgfd;
close $upkgfd;
}
$srcfd = _open_data_file ($srcs);
$srcsub = sub { _parse_srcs_pg ($active_srcs, $srcman, $mirdir, $area, @_) };
- Util::_parse_dpkg_control_iterative ($srcsub, $srcfd);
+ Lintian::Util::_parse_dpkg_control_iterative ($srcsub, $srcfd);
close $srcfd;
}
}
diff --git a/reporting/html_reports b/reporting/html_reports
index 86f87ff..5e41254 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -54,7 +54,7 @@ use Lintian::Data;
use Lintian::Lab;
use Lintian::Profile;
use Lintian::Internal::FrontendUtil;
-use Util;
+use Lintian::Util;
my $profile = Lintian::Profile->new (find_default_profile ("$LINTIAN_ROOT/profiles"),
$LINTIAN_ROOT,
diff --git a/t/helpers/bin/create-deb b/t/helpers/bin/create-deb
index 5f02e63..f8d7a4e 100755
--- a/t/helpers/bin/create-deb
+++ b/t/helpers/bin/create-deb
@@ -27,7 +27,7 @@ use Getopt::Long;
use Cwd();
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util qw(get_dsc_info);
+use Lintian::Util qw(get_dsc_info);
# known compression styles
my %TAR_OPTIONS = (
diff --git a/t/runtests b/t/runtests
index 164ecf2..4086506 100755
--- a/t/runtests
+++ b/t/runtests
@@ -58,7 +58,7 @@ BEGIN {
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Util;
+use Lintian::Util;
# --- Global configuration
diff --git a/t/scripts/Util/path.t b/t/scripts/Lintian/Util/path.t
similarity index 90%
rename from t/scripts/Util/path.t
rename to t/scripts/Lintian/Util/path.t
index 77b9ac5..c94205f 100644
--- a/t/scripts/Util/path.t
+++ b/t/scripts/Lintian/Util/path.t
@@ -4,9 +4,9 @@ use strict;
use warnings;
use Test::More tests => 12;
-# Util exports fail, which clashes with Test::More, so we
+# Lintian::Util exports fail, which clashes with Test::More, so we
# have to be explicit about the import(s).
-BEGIN { use_ok('Util', qw(resolve_pkg_path)); }
+BEGIN { use_ok('Lintian::Util', qw(resolve_pkg_path)); }
# Safe - absolute
is(resolve_pkg_path('/usr/share/java', '/usr/share/ant/file'), 'usr/share/ant/file', 'Safe absolute path');
diff --git a/t/scripts/implemented-tags.t b/t/scripts/implemented-tags.t
index 8672416..9849499 100755
--- a/t/scripts/implemented-tags.t
+++ b/t/scripts/implemented-tags.t
@@ -19,7 +19,7 @@
use strict;
use Test::More;
-use Util qw(read_dpkg_control slurp_entire_file);
+use Lintian::Util qw(read_dpkg_control slurp_entire_file);
# Exclude the following tags, which are handled specially and can't be
# detected by this script.
diff --git a/t/scripts/needs-info-exists.t b/t/scripts/needs-info-exists.t
index 104193f..b382d73 100755
--- a/t/scripts/needs-info-exists.t
+++ b/t/scripts/needs-info-exists.t
@@ -19,7 +19,7 @@
use strict;
use Test::More;
-use Util qw(read_dpkg_control);
+use Lintian::Util qw(read_dpkg_control);
# Find all of the desc files in either collection or checks. We'll do one
# check per description.
diff --git a/t/scripts/needs-info-missing.t b/t/scripts/needs-info-missing.t
index 87c1add..2183618 100755
--- a/t/scripts/needs-info-missing.t
+++ b/t/scripts/needs-info-missing.t
@@ -19,7 +19,7 @@
use strict;
use Test::More;
-use Util qw(read_dpkg_control slurp_entire_file);
+use Lintian::Util qw(read_dpkg_control slurp_entire_file);
# Find all of the desc files in checks. We'll do one check per description.
our @DESCS = (<$ENV{LINTIAN_ROOT}/checks/*.desc>,
diff --git a/t/scripts/profiles-coverage.t b/t/scripts/profiles-coverage.t
index ef0d789..fe993f9 100755
--- a/t/scripts/profiles-coverage.t
+++ b/t/scripts/profiles-coverage.t
@@ -10,7 +10,7 @@ use warnings;
use Test::More;
use File::Find;
-require Util; # Test::More (also) exports fail
+use Lintian::Util qw(read_dpkg_control); # Test::More (also) exports fail
my $root = $ENV{'LINTIAN_ROOT'};
my @profiles;
@@ -18,7 +18,7 @@ my %CHECKS;
my %TAGS;
foreach my $desc (<$root/checks/*.desc>) {
- my ($header, @tags) = Util::read_dpkg_control($desc);
+ my ($header, @tags) = read_dpkg_control($desc);
my $list = [];
unless ($header->{'check-script'}) {
fail("missing Check-Script field in $desc");
@@ -47,7 +47,7 @@ exit 0;
sub parse_profile {
my ($profile) = @_;
- my ($header, @section) = Util::read_dpkg_control($profile);
+ my ($header, @section) = read_dpkg_control($profile);
my $en_checks = $header->{'enable-tags-from-check'}//'';
my $dis_checks = $header->{'disable-tags-from-check'}//'';
my $en_tag = $header->{'enable-tags'}//'';
diff --git a/t/scripts/tags.t b/t/scripts/tags.t
index ae44f07..51e4666 100755
--- a/t/scripts/tags.t
+++ b/t/scripts/tags.t
@@ -27,7 +27,7 @@ use Lintian::Check qw(check_spelling);
use Lintian::Data;
use Lintian::Profile;
use Lintian::Tags ();
-use Util qw(read_dpkg_control);
+use Lintian::Util qw(read_dpkg_control);
my $vendor = Lintian::Profile->new ('debian/main', $ENV{'LINTIAN_ROOT'},
["$ENV{'LINTIAN_ROOT'}/profiles"]);
diff --git a/t/scripts/unpack-level.t b/t/scripts/unpack-level.t
index 62bf298..a684eb0 100755
--- a/t/scripts/unpack-level.t
+++ b/t/scripts/unpack-level.t
@@ -19,7 +19,7 @@
use strict;
use Test::More;
-use Util qw(read_dpkg_control slurp_entire_file);
+use Lintian::Util qw(read_dpkg_control slurp_entire_file);
# Find all of the desc files in either collection or checks. We'll do one
# check per description.
diff --git a/t/source/changelog-file-symlink/Makefile b/t/source/changelog-file-symlink/Makefile
index acafbeb..146ad86 100644
--- a/t/source/changelog-file-symlink/Makefile
+++ b/t/source/changelog-file-symlink/Makefile
@@ -12,11 +12,11 @@ all:
echo '3.0 (quilt)' > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/control-field-traversal-1/Makefile b/t/source/control-field-traversal-1/Makefile
index 03de3c4..7ff7636 100644
--- a/t/source/control-field-traversal-1/Makefile
+++ b/t/source/control-field-traversal-1/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/control-field-traversal-2/Makefile b/t/source/control-field-traversal-2/Makefile
index 3eff987..0c3c570 100644
--- a/t/source/control-field-traversal-2/Makefile
+++ b/t/source/control-field-traversal-2/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/control-field-traversal-3/Makefile b/t/source/control-field-traversal-3/Makefile
index 8bf06c1..d68a358 100644
--- a/t/source/control-field-traversal-3/Makefile
+++ b/t/source/control-field-traversal-3/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/control-file-duplicate-field/Makefile b/t/source/control-file-duplicate-field/Makefile
index 69469ed..fd2e374 100644
--- a/t/source/control-file-duplicate-field/Makefile
+++ b/t/source/control-file-duplicate-field/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/control-file-missing-separator/Makefile b/t/source/control-file-missing-separator/Makefile
index 4ea045a..d819ae2 100644
--- a/t/source/control-file-missing-separator/Makefile
+++ b/t/source/control-file-missing-separator/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/control-file-syntax-error/Makefile b/t/source/control-file-syntax-error/Makefile
index b5bb5aa..30539ef 100644
--- a/t/source/control-file-syntax-error/Makefile
+++ b/t/source/control-file-syntax-error/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/debian-source-dir-traversal-1/Makefile b/t/source/debian-source-dir-traversal-1/Makefile
index 284c306..a784d5c 100644
--- a/t/source/debian-source-dir-traversal-1/Makefile
+++ b/t/source/debian-source-dir-traversal-1/Makefile
@@ -16,11 +16,11 @@ all:
touch $(dir)/debian/patches/series
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/debian-source-dir-traversal-2/Makefile b/t/source/debian-source-dir-traversal-2/Makefile
index 10d87d2..2ce36d5 100644
--- a/t/source/debian-source-dir-traversal-2/Makefile
+++ b/t/source/debian-source-dir-traversal-2/Makefile
@@ -10,11 +10,11 @@ all:
ln -s ../ $(dir)/debian/source
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/debian-source-dir-unknown-source-format/Makefile b/t/source/debian-source-dir-unknown-source-format/Makefile
index 847f9f5..c3c9e61 100644
--- a/t/source/debian-source-dir-unknown-source-format/Makefile
+++ b/t/source/debian-source-dir-unknown-source-format/Makefile
@@ -10,11 +10,11 @@ all:
echo "3.0 (unknown-format)" > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/debian-symlink/Makefile b/t/source/debian-symlink/Makefile
index 43e0116..4fca09e 100644
--- a/t/source/debian-symlink/Makefile
+++ b/t/source/debian-symlink/Makefile
@@ -10,11 +10,11 @@ all:
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
diff --git a/t/source/fields-src-fields-filename/Makefile b/t/source/fields-src-fields-filename/Makefile
index c38b4a2..37ae6db 100644
--- a/t/source/fields-src-fields-filename/Makefile
+++ b/t/source/fields-src-fields-filename/Makefile
@@ -11,11 +11,11 @@ all:
cp changelog copyright control rules $(dir)/debian/
tar cfz $(dsc)_1.tar.gz $(dir)
cp dsc.in $(dsc)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha1", "$(dsc)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(dsc)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("sha256", "$(dsc)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(dsc)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+ perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
'BEGIN { $$h = get_file_checksum("md5", "$(dsc)_1.tar.gz") } s/\@MD5\@/$$h/g' $(dsc)_1.dsc
perl -i -pe 'BEGIN { $$s = (stat "$(dsc)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(dsc)_1.dsc
mv $(dsc)_1.dsc $(name)_1.dsc
diff --git a/testset/runtests b/testset/runtests
index 1c0f4b7..a1691f0 100755
--- a/testset/runtests
+++ b/testset/runtests
@@ -114,7 +114,7 @@ my $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'};
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Lintian::Profile;
-use Util;
+use Lintian::Util;
# --- Set the ways to call lintian and dpkg-buildpackage
my $lintian_options = '-I -E';
--
Debian package checker
Reply to: