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

lintian: r810 - in trunk: checks collection frontend lib reporting testset unpack

Author: jaalto
Date: 2007-01-30 14:39:13 +0100 (Tue, 30 Jan 2007)
New Revision: 810

Modified:
   trunk/checks/debhelper
   trunk/collection/changelog-file
   trunk/collection/copyright-file
   trunk/collection/debfiles
   trunk/collection/debian-readme
   trunk/collection/diffstat
   trunk/collection/doc-base-files
   trunk/collection/file-info
   trunk/collection/init.d
   trunk/collection/md5sums
   trunk/collection/menu-files
   trunk/collection/override-file
   trunk/collection/source-control-file
   trunk/frontend/lintian-info
   trunk/lib/Dep.pm
   trunk/lib/Read_pkglists.pm
   trunk/lib/Read_taginfo.pm
   trunk/reporting/html_reports
   trunk/testset/runtests
   trunk/unpack/list-binpkg
   trunk/unpack/list-srcpkg
   trunk/unpack/list-udebpkg
   trunk/unpack/unpack-binpkg-l1
   trunk/unpack/unpack-binpkg-l2
   trunk/unpack/unpack-srcpkg-l1
   trunk/unpack/unpack-srcpkg-l2
Log:
*  frontend/lintian-info
   checks/debhelper
   unpack/list-srcpkg
   unpack/unpack-srcpkg-l1
   unpack/list-binpkg
   unpack/unpack-binpkg-l1
   unpack/unpack-srcpkg-l2
   unpack/unpack-binpkg-l2
   unpack/list-udebpkg
   lib/Dep.pm
   lib/Read_pkglists.pm
   lib/Read_taginfo.pm
   reporting/html_reports
   collection/copyright-file
   collection/init.d
   collection/source-control-file
   collection/override-file
   collection/md5sums
   collection/diffstat
   collection/changelog-file
   collection/menu-files
   collection/file-info
   collection/doc-base-files
   collection/debian-readme
   collection/debfiles
   testset/runtests
   + [JA] Manual_refs.pm: Perl -cw fixes. 



Modified: trunk/checks/debhelper
===================================================================
--- trunk/checks/debhelper	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/checks/debhelper	2007-01-30 13:39:13 UTC (rev 810)
@@ -28,7 +28,7 @@
 my $pkg = shift;
 my $type = shift;
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Dep;
 
 my %commands;
@@ -148,7 +148,7 @@
     or fail("Can't open debfiles directory.");
 while (defined(my $file=readdir(DEBIAN))) {
     if ($file =~ m/^(?:(.*)\.)?(?:post|pre)(?:inst|rm)$/) {
-	
+
         my $binpkg = $1 || '';
 	open(IN,"debfiles/$file")
 	    or fail("Can't open debfiles/$file: $!");
@@ -160,7 +160,7 @@
 	    }
 	}
 	close IN;
-	
+
 	if ((! $seentag) and $needtomodifyscripts) {
 	    tag "maintainer-script-lacks-debhelper-token", "debian/$file" unless $binpkg && $pkgs{$binpkg} && ($pkgs{$binpkg} =~ /udeb/i);
 	}

Modified: trunk/collection/changelog-file
===================================================================
--- trunk/collection/changelog-file	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/changelog-file	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # changelog-file -- lintian collector script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -75,7 +75,7 @@
 if (not defined $chl) {
     # no changelog found
 } elsif ($chl =~ /\.gz$/) {
-    use lib "$ENV{'LINTIAN_ROOT'}/lib";
+    BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
     use Pipeline;
 
     pipeline((sub { exec 'gzip', '-dc', $chl }), "changelog") == 0

Modified: trunk/collection/copyright-file
===================================================================
--- trunk/collection/copyright-file	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/copyright-file	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # copyright-file -- lintian collector script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -40,7 +40,7 @@
     link($file, "copyright")
 	or fail("cannot link $file to copyright: $!");
 } elsif (-f "$file.gz") {
-    use lib "$ENV{'LINTIAN_ROOT'}/lib";
+    BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
     use Pipeline;
 
     pipeline((sub { exec 'gzip', '-dc', $file }), "copyright") == 0

Modified: trunk/collection/debfiles
===================================================================
--- trunk/collection/debfiles	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/debfiles	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # debfiles -- lintian collector script
 
 # Copyright (C) 1999 by Joey Hess
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -27,7 +27,7 @@
 
 -e "unpacked" or fail("debfiles invoked in wrong directory");
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 if (-e "debfiles") {

Modified: trunk/collection/debian-readme
===================================================================
--- trunk/collection/debian-readme	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/debian-readme	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # debian-readme -- lintian collector script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -52,7 +52,7 @@
     open(DUMMY, ">README.Debian");
     close(DUMMY);
 } elsif ($file =~ m/\.gz$/) {
-    use lib "$ENV{'LINTIAN_ROOT'}/lib";
+    BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
     use Pipeline;
 
     pipeline((sub { exec 'gzip', '-dc', $file }), "README.Debian") == 0

Modified: trunk/collection/diffstat
===================================================================
--- trunk/collection/diffstat	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/diffstat	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # diffstat -- lintian collection script for source packages
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -47,7 +47,7 @@
   exit 0;
 }
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 pipeline((sub { exec('gzip', '-dc', $diff_file); }),
          "debian-patch"

Modified: trunk/collection/doc-base-files
===================================================================
--- trunk/collection/doc-base-files	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/doc-base-files	2007-01-30 13:39:13 UTC (rev 810)
@@ -3,17 +3,17 @@
 
 # Copyright (C) 1998 Richard Braakman
 # Copyright (C) 2001 Josip Rodin
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -28,7 +28,7 @@
 
 -f "fields/package" or fail("doc-base-files invoked in wrong directory");
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 if (-e "doc-base") {

Modified: trunk/collection/file-info
===================================================================
--- trunk/collection/file-info	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/file-info	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # file-info -- lintian collection script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -32,7 +32,7 @@
     or fail("cannot chdir to unpacked directory: $!");
 
 use FileHandle;
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 my $XARGS=FileHandle->new;

Modified: trunk/collection/init.d
===================================================================
--- trunk/collection/init.d	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/init.d	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # init.d -- lintian collector script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -27,7 +27,7 @@
 
 -f "fields/package" or fail("init.d invoked in wrong directory");
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 if (-e "init.d") {

Modified: trunk/collection/md5sums
===================================================================
--- trunk/collection/md5sums	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/md5sums	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # md5sums -- lintian collection script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -32,7 +32,7 @@
     or fail("cannot chdir to unpacked directory: $!");
 
 use FileHandle;
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 my $XARGS=FileHandle->new;

Modified: trunk/collection/menu-files
===================================================================
--- trunk/collection/menu-files	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/menu-files	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # menu-files -- lintian collector script
 
 # Copyright (C) 1998 Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -27,7 +27,7 @@
 
 -f "fields/package" or fail("menu-files invoked in wrong directory");
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 if (-e "menu") {
@@ -37,7 +37,7 @@
 
 mkdir("menu", 0777) or fail("cannot mkdir menu: $!");
 
-if (-d "unpacked/usr/lib/menu") {    
+if (-d "unpacked/usr/lib/menu") {
     spawn('cp', '-a', 'unpacked/usr/lib/menu', 'menu/lib') == 0
 	or fail("cannot copy unpacked/usr/lib/menu/ directory");
 } else {
@@ -45,7 +45,7 @@
     mkdir("menu/lib", 0777) or fail("cannot mkdir menu/lib: $!");
 }
 
-if (-d "unpacked/usr/share/menu") {    
+if (-d "unpacked/usr/share/menu") {
     spawn('cp', '-a', 'unpacked/usr/share/menu', 'menu/share') == 0
 	or fail("cannot copy unpacked/usr/share/menu directory");
 } else {

Modified: trunk/collection/override-file
===================================================================
--- trunk/collection/override-file	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/override-file	2007-01-30 13:39:13 UTC (rev 810)
@@ -3,17 +3,17 @@
 
 # Copyright (C) 1999 by Darren Benham
 # Derived from debian-readme by Richard Braakman
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -38,7 +38,7 @@
     $file = "unpacked/usr/share/lintian/overrides/$pkg";
 }
 
-if ( ! -f $file ) 
+if ( ! -f $file )
 { 	if ( -f $file . ".gz" ) { $file = $file . ".gz"; }
 	else { $file = ''; }
 }
@@ -46,7 +46,7 @@
 if ( $file eq '' ) {
     # no override found
 } elsif ($file =~ /\.gz$/) {
-    use lib "$ENV{'LINTIAN_ROOT'}/lib";
+    BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
     use Pipeline;
 
     pipeline((sub { exec 'gzip', '-dc', $file }), "override") == 0

Modified: trunk/collection/source-control-file
===================================================================
--- trunk/collection/source-control-file	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/collection/source-control-file	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # source-control-file -- lintian collector script
 
 # Copyright (C) 2004 Frank Lichtenheld
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -28,7 +28,7 @@
 
 -f "debfiles/control" or fail("control invoked in wrong directory");
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Util;
 
 my @control_data = read_dpkg_control("debfiles/control");

Modified: trunk/frontend/lintian-info
===================================================================
--- trunk/frontend/lintian-info	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/frontend/lintian-info	2007-01-30 13:39:13 UTC (rev 810)
@@ -35,7 +35,7 @@
 }
 
 # import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Read_taginfo;
 
 my %already_displayed = ();

Modified: trunk/lib/Dep.pm
===================================================================
--- trunk/lib/Dep.pm	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/lib/Dep.pm	2007-01-30 13:39:13 UTC (rev 810)
@@ -18,7 +18,7 @@
 
 use strict;
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 package Dep;
@@ -27,7 +27,7 @@
 # public routines
 
 sub Pred {
-    $_[0] =~ 
+    $_[0] =~
 	    /^\s*                           # skip leading whitespace
 	      ([a-zA-Z0-9][a-zA-Z0-9+.-]+)  # package name
 	      (?:                           # start of optional part

Modified: trunk/lib/Read_pkglists.pm
===================================================================
--- trunk/lib/Read_pkglists.pm	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/lib/Read_pkglists.pm	2007-01-30 13:39:13 UTC (rev 810)
@@ -21,7 +21,7 @@
 
 use strict;
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Util;
 
 use vars qw($BINLIST_FORMAT $SRCLIST_FORMAT $UDEBLIST_FORMAT %source_info %binary_info %udeb_info %bin_src_ref);

Modified: trunk/lib/Read_taginfo.pm
===================================================================
--- trunk/lib/Read_taginfo.pm	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/lib/Read_taginfo.pm	2007-01-30 13:39:13 UTC (rev 810)
@@ -22,7 +22,7 @@
 my $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'} || '/usr/share/lintian';
 my $debug = $ENV{'LINTIAN_DEBUG'} || 0;
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Util;
 use Text_utils;
 use Manual_refs;
@@ -109,7 +109,7 @@
 	    $foo[$u] = "the $foo[$u] manual page";
 	}
     }
-	
+
     if ($#foo+1 > 2) {
 	$ref = sprintf "Refer to %s, and %s for details.",join(', ',splice(@foo,0,$#foo)),@foo;
     } elsif ($#foo+1 > 0) {

Modified: trunk/reporting/html_reports
===================================================================
--- trunk/reporting/html_reports	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/reporting/html_reports	2007-01-30 13:39:13 UTC (rev 810)
@@ -38,7 +38,7 @@
 $ENV{'LINTIAN_ROOT'} = $LINTIAN_ROOT;
 
 # Import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Util;
 use Read_taginfo;
 my %tag_info = %{read_tag_info('html')};
@@ -114,12 +114,12 @@
 
     if (not exists $source_info{$src}) {
 	# work around:
-	$source_info{$src}->{'maintainer'} = 
-	    $binary_info{$pkg}->{'maintainer'} || 
+	$source_info{$src}->{'maintainer'} =
+	    $binary_info{$pkg}->{'maintainer'} ||
 	    $udeb_info{$pkg}->{'maintainer'} || '(unknown)';
 	$source_info{$src}->{'version'} = $binary_info{$pkg}->{'version'};
     }
-  
+
     push(@{$by_src{$src}},$_);
     push(@{$by_tag{$tag}},$_);
 }

Modified: trunk/testset/runtests
===================================================================
--- trunk/testset/runtests	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/testset/runtests	2007-01-30 13:39:13 UTC (rev 810)
@@ -104,7 +104,7 @@
 
 my $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'};
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Util;
 use Tags;
 
@@ -212,7 +212,7 @@
     close(CHANGELOG);
     $line =~ s/^.*\(//;
     $line =~ s/\).*$//;
-    
+
     my ($pkg, $ver) = ($pkgdir, $line);
     print "Running test on $pkg $ver: copying... ";
 

Modified: trunk/unpack/list-binpkg
===================================================================
--- trunk/unpack/list-binpkg	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/list-binpkg	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # list-binpkg -- lintian helper script
 
 # Copyright (C) 1998 Christian Schwarz
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -59,7 +59,7 @@
 }
 
 # import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Read_pkglists;
 use vars qw(%binary_info $BINLIST_FORMAT); # from the above
 use Pipeline;
@@ -94,7 +94,7 @@
 	open(IN,"$packages") or fail("cannot open Packages file $packages: $!");
 } elsif (-e "$packages.gz") {
 	print "N: Parsing $packages.gz ...\n" if $verbose;
-	open(IN,"gzip -dc $packages.gz | ") or fail("cannot open Packages file $packages.gz: $!");	
+	open(IN,"gzip -dc $packages.gz | ") or fail("cannot open Packages file $packages.gz: $!");
 } else {
 	fail("No packages file $packages");
 }

Modified: trunk/unpack/list-srcpkg
===================================================================
--- trunk/unpack/list-srcpkg	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/list-srcpkg	2007-01-30 13:39:13 UTC (rev 810)
@@ -2,17 +2,17 @@
 # list-srcpkg -- lintian helper script
 
 # Copyright (C) 1998 Christian Schwarz
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -57,7 +57,7 @@
 }
 
 # import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Read_pkglists;
 use vars qw(%source_info $SRCLIST_FORMAT); # from the above
 use Util;
@@ -96,7 +96,7 @@
   do { $line = <IN> } until ($line =~ m/^ [0-9a-f]{32} [0-9]+ (.+\.dsc)$/m);
   my $dsc_file = "$pkg_dir/$1";
   do { $line = <IN> } until ($line =~ m/^\s*$/m);
-  
+
   my @stat;
   # get timestamp...
   unless (@stat = stat "$LINTIAN_ARCHIVEDIR/$dsc_file") {
@@ -136,7 +136,7 @@
       print "E: general: bad-source-package $dsc_file\n";
       next;
     }
-    my @f = (); 
+    my @f = ();
     for my $fs (split(/\n/,$data->{'files'})) {
       next if $fs =~ /^\s*$/o;
       my @t = split(/\s+/o,$fs);

Modified: trunk/unpack/list-udebpkg
===================================================================
--- trunk/unpack/list-udebpkg	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/list-udebpkg	2007-01-30 13:39:13 UTC (rev 810)
@@ -3,17 +3,17 @@
 
 # Copyright (C) 1998 Christian Schwarz
 # Copyright (C) 2004 Frank Lichtenheld
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -60,7 +60,7 @@
 }
 
 # import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Read_pkglists;
 use vars qw(%udeb_info $UDEBLIST_FORMAT); # from the above
 use Pipeline;

Modified: trunk/unpack/unpack-binpkg-l1
===================================================================
--- trunk/unpack/unpack-binpkg-l1	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/unpack-binpkg-l1	2007-01-30 13:39:13 UTC (rev 810)
@@ -31,7 +31,7 @@
 my $file = shift;
 
 # import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 use Util;
 

Modified: trunk/unpack/unpack-binpkg-l2
===================================================================
--- trunk/unpack/unpack-binpkg-l2	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/unpack-binpkg-l2	2007-01-30 13:39:13 UTC (rev 810)
@@ -27,7 +27,7 @@
 ($#ARGV == 0) or fail("syntax: unpack-binpkg-l2 <base-dir>");
 my $base_dir = shift;
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 print "N: Unpacking binary packages in directory $base_dir ...\n" if $verbose;

Modified: trunk/unpack/unpack-srcpkg-l1
===================================================================
--- trunk/unpack/unpack-srcpkg-l1	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/unpack-srcpkg-l1	2007-01-30 13:39:13 UTC (rev 810)
@@ -6,17 +6,17 @@
 # Note, that <dsc-file> must be specified with absolute path.
 
 # Copyright (C) 1998 Christian Schwarz
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, you can find it on the World Wide
 # Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -31,7 +31,7 @@
 my $file = shift;
 
 # import perl libraries
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Util;
 
 use File::Basename;

Modified: trunk/unpack/unpack-srcpkg-l2
===================================================================
--- trunk/unpack/unpack-srcpkg-l2	2007-01-30 13:15:38 UTC (rev 809)
+++ trunk/unpack/unpack-srcpkg-l2	2007-01-30 13:39:13 UTC (rev 810)
@@ -25,7 +25,7 @@
 use vars qw($verbose);
 use FileHandle;
 
-use lib "$ENV{'LINTIAN_ROOT'}/lib";
+BEGIN { push @INC, "$ENV{LINTIAN_ROOT}/checks" if defined $ENV{LINTIAN_ROOT}; }
 use Pipeline;
 
 ($#ARGV == 0) or fail("syntax: unpack-srcpkg-l2 <base-dir>");
Reply to: