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

[SCM] Debian package checker branch, master, updated. 2.5.12-130-geec546d

The following commit has been merged in the master branch:
commit eec546d5b940d7317f32ab32ff534d3202e87c57
Author: Niels Thykier <niels@thykier.net>
Date:   Mon May 27 17:29:09 2013 +0200

    coll: Move coll helpers to helpers/coll
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/file-info b/collection/file-info
index 31e3558..ec85265 100755
--- a/collection/file-info
+++ b/collection/file-info
@@ -25,13 +25,13 @@ use strict;
 use warnings;
 use autodie;
 
-use Cwd qw(realpath);
 use FileHandle;
 use lib "$ENV{'LINTIAN_ROOT'}/lib";
 use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
+use Lintian::Util qw(locate_helper_tool);
 
-my $helper = realpath (__FILE__ . '-helper');
+my $helper = locate_helper_tool('coll/file-info-helper');
 
 sub collect {
 my ($pkg, $type, $dir) = @_;
diff --git a/collection/hardening-info b/collection/hardening-info
index 0ca86ed..2d60ac6 100755
--- a/collection/hardening-info
+++ b/collection/hardening-info
@@ -32,15 +32,14 @@ use strict;
 use warnings;
 use autodie;
 
-use Cwd qw(realpath);
 use FileHandle;
 
 use lib "$ENV{'LINTIAN_ROOT'}/lib";
 use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
-use Lintian::Util qw(fail touch_file);
+use Lintian::Util qw(fail touch_file locate_helper_tool);
 
-my $helper = realpath (__FILE__ . '-helper');
+my $helper = locate_helper_tool('coll/hardening-info-helper');
 
 sub collect {
 my ($pkg, $type, $dir) = @_;
diff --git a/collection/objdump-info b/collection/objdump-info
index 2c68db0..3e32c75 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -29,14 +29,14 @@ use strict;
 use warnings;
 use autodie;
 
-use Cwd qw(realpath);
 use FileHandle;
 
 use lib "$ENV{'LINTIAN_ROOT'}/lib/";
 use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
+use Lintian::Util qw(locate_helper_tool);
 
-my $helper = realpath (__FILE__ . '-helper');
+my $helper = locate_helper_tool('coll/objdump-info-helper');
 
 sub collect {
 my ($pkg, $type, $dir) = @_;
diff --git a/collection/strings b/collection/strings
index fbce92c..1921afb 100755
--- a/collection/strings
+++ b/collection/strings
@@ -25,16 +25,15 @@ use strict;
 use warnings;
 use autodie;
 
-use Cwd qw(realpath);
 use FileHandle;
 
 use lib "$ENV{'LINTIAN_ROOT'}/lib";
 use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
-use Lintian::Util qw(delete_dir fail);
+use Lintian::Util qw(delete_dir fail locate_helper_tool);
 
 
-my $helper = realpath(__FILE__ . '-helper');
+my $helper = locate_helper_tool('coll/strings-helper');
 
 sub collect {
 
diff --git a/debian/changelog b/debian/changelog
index 1ccc52c..dd5eb17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,8 @@ lintian (2.5.13) UNRELEASED; urgency=low
     + [NT] Remove check for "dpkg-dev (>= 1.16.1~)" build-dependency,
       since this is trivially satisfied in Wheezy and Jessie.
 
+  * collection/*-helper:
+    + [NT] Move all collection helpers to helpers/coll.
   * collection/debfiles:
     + [NT] Replace makeshift "is_ancestor_of" check with the
       one from L::Util.
@@ -109,6 +111,8 @@ lintian (2.5.13) UNRELEASED; urgency=low
       trivially satisfied in stable.
     + [NT] Recommend libautodie-perl (>= 2.18) and libperlio-gzip-perl
       as these can greatly effect performance of Lintian.
+  * debian/lintian.install:
+    + [NT] Install "helpers" as /usr/share/lintian/helpers
   * debian/{postinst,prerm}:
     + [NT] Remove unused maintainer scripts now that stable's
       libc-bin provides a C.UTF-8.
@@ -129,6 +133,10 @@ lintian (2.5.13) UNRELEASED; urgency=low
       Lintian.  The first being a list of raw include dirs and the
       second being a list of helpers dirs in these include dirs.
 
+  * helpers/coll:
+    + [NT] New directory containing some helpers that used to be in
+      directly collection.
+
   * lib/*:
     + [NT] Fix a number of spelling mistakes in the POD.
   * lib/Lintian/Collect/{Package,Binary}.pm:
diff --git a/debian/lintian.install b/debian/lintian.install
index 4981058..c8eec61 100644
--- a/debian/lintian.install
+++ b/debian/lintian.install
@@ -3,6 +3,7 @@ frontend/lintian-info	usr/bin
 checks			usr/share/lintian
 collection		usr/share/lintian
 data		  	usr/share/lintian
+helpers 		usr/share/lintian
 lib/Lintian		usr/share/perl5
 lib/Test		usr/share/lintian/lib
 profiles		usr/share/lintian
diff --git a/collection/file-info-helper b/helpers/coll/file-info-helper
similarity index 100%
rename from collection/file-info-helper
rename to helpers/coll/file-info-helper
diff --git a/collection/hardening-info-helper b/helpers/coll/hardening-info-helper
similarity index 100%
rename from collection/hardening-info-helper
rename to helpers/coll/hardening-info-helper
diff --git a/collection/objdump-info-helper b/helpers/coll/objdump-info-helper
similarity index 100%
rename from collection/objdump-info-helper
rename to helpers/coll/objdump-info-helper
diff --git a/collection/strings-helper b/helpers/coll/strings-helper
similarity index 100%
rename from collection/strings-helper
rename to helpers/coll/strings-helper
diff --git a/t/scripts/needs-info-exists.t b/t/scripts/needs-info-exists.t
index 78f0971..32e5023 100755
--- a/t/scripts/needs-info-exists.t
+++ b/t/scripts/needs-info-exists.t
@@ -25,6 +25,7 @@ use Lintian::CollScript;
 use Lintian::Util qw(read_dpkg_control);
 
 $ENV{'LINTIAN_ROOT'} //= '.';
+$ENV{'LINTIAN_HELPER_DIRS'} = "$ENV{'LINTIAN_ROOT'}/helpers";
 
 # Find all of the desc files in collection.  We'll do one check per
 # description.  We don't check checks/*.desc because check-desc.t

-- 
Debian package checker
Reply to: