[SCM] Debian package checker branch, master, updated. 2.5.11-53-g89c48ec

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

The following commit has been merged in the master branch:
commit 89c48ece944aafaea0aaf8eceb96295207ec13ac
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jan 7 19:37:47 2013 +0100

    lintian{,-info}: Add --[no-]user-dirs to usage
    
    ... and fix LINTIAN_ROOT for lintian-info.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/frontend/lintian b/frontend/lintian
index 8a29ce0..1b211f3 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -211,6 +211,7 @@ Configuration options:
     -j X, --jobs X            limit the number of parallel unpacking jobs to X
     --lab LABDIR              use LABDIR as permanent laboratory
     --root ROOTDIR            use ROOTDIR instead of /usr/share/lintian
+    --[no-]user-dirs          whether to use files from user directories
 Package selection options:
     -a, --all                 process all packages in distribution
     -b, --binary              process only binary packages
diff --git a/frontend/lintian-info b/frontend/lintian-info
index 31ea465..0b2a805 100755
--- a/frontend/lintian-info
+++ b/frontend/lintian-info
@@ -67,6 +67,7 @@ Options:
     -a, --annotate    display descriptions of tags in Lintian overrides
     -t, --tags        display tag descriptions
     --profile X       use vendor profile X to determine severities
+    --[no-]user-dirs  whether to include profiles from user directories
 EOT
 
     exit 0;
@@ -79,7 +80,7 @@ if ($user_dirs) {
 }
 # Add the Lintian root in the end...
 push @dirs, $ENV{'LINTIAN_ROOT'} if exists $ENV{'LINTIAN_ROOT'};
-push @dirs, $ENV{'LINTIAN_ROOT'} unless exists $ENV{'LINTIAN_ROOT'};
+push @dirs, '/usr/share/lintian' unless exists $ENV{'LINTIAN_ROOT'};
 
 $profile = Lintian::Profile->new ($prof, \@dirs);
 

-- 
Debian package checker