[SCM] Debian package checker branch, master, updated. 2.5.1-185-g047a2f5

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

The following commit has been merged in the master branch:
commit 047a2f556dcb3a88b5d41c9125623577e3ac3c04
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Aug 6 12:38:12 2011 +0200

    Documentated the configuration format in lintian(1)
    
    Boolean options in the configuration file are now parse in a
    case-insensitive matter and "y" is now properly accepted as
    the short form of "yes".

diff --git a/debian/changelog b/debian/changelog
index 1f82a06..5f490cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -235,6 +235,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
       "-" for stdin and the format is simpler.
     + [NT] Deprecated "--packages-file" in favour of the new
       "--packages-from-file" option.
+    + [NT] Allow "y" as short form of "yes" in the configuration file.
+      Furthermore, ignore case when doing the check for boolean
+      values.
 
   * lib/Lab.pm:
     + [NT] Removed $dist argument to lab creation, since we rely on
@@ -281,6 +284,8 @@ lintian (2.5.2) UNRELEASED; urgency=low
       levels have been replaced by collections.
     + [NT] Clarified that some command-line arguments are only
       useful when using a static lintian lab.
+    + [NT] Described the configuration file format.  Thanks to
+      Sven Joachim for the report.  (Closes: #636681)
   * man/lintian-info.pod:
     + [NT] Documented the new --profile option.
 
diff --git a/frontend/lintian b/frontend/lintian
index 3fca7b5..0625b61 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -634,9 +634,9 @@ if ($opt{'LINTIAN_CFG'}) {
 		}
 		$conf_opt{$var} = 1;
 		$found = 1;
-		if ($val =~ m/^y(?:es)|true$/o){
+		if ($val =~ m/^y(?:es)?|true$/oi){
 		    $val = 1;
-		} elsif ($val =~ m/^no?|false$/o){
+		} elsif ($val =~ m/^no?|false$/oi){
 		    $val = 0;
 		}
 		if (ref $ref eq 'SCALAR'){
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index e2d7708..b63b362 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -515,6 +515,64 @@ I<debian/source.lintian-overrides> if the first file is not found.
 The first path is preferred.  See the Lintian User's Manual for the
 syntax of overrides.
 
+=head1 CONFIGURATION FILE
+
+The configuration file can be used to specify default values for some
+options.  The general format is:
+
+ option = value
+
+All whitespace adjacent to the "=" sign as well as leading and
+trailing whitespace is ignored.  However whitespace within the
+value is respected, as demonstrated by this example:
+
+ # Parsed as "opt1" with value "val1"
+    opt1    =   val1
+ # Parsed as "opt2" with value "val2.1  val2.2     val2.3"
+ opt2 = val2.1  val2.2     val2.3
+
+Unless otherwise specified, no option may appear more than once.
+Lintian will ignore empty lines or lines starting with the
+B<#>-character.
+
+Generally options will be the long form of the command-line option
+without the leading dashes.  There some exceptions (such as --area),
+where Lintian uses the same name as the environment variable.
+
+Lintian only allows a subset of the options specified in the
+configuration file; please refer to the individual options in
+L</OPTIONS>.
+
+In the configuration file, all options listed must have a value, even
+if they do not accept a value on command line (i.e. --pedantic).  The
+values "yes", "y", "1", or "true" will enable such a option and "no",
+"n", "0" or "false" will disable it.  Prior to the 2.5.2 release,
+these values were case sensitive.
+
+For other options, they generally take the same values as they do on
+the command line.  Though some options allow a slightly different
+format (i.e. --display-level); these exceptions are explained for the
+relevant options in L</OPTIONS>.
+
+A sample configuration file could look like:
+
+ # Sample configuration file for lintian
+ #
+ # Set the default profile (--profile)
+ LINTIAN_PROFILE = debian
+ 
+ # Show info (I:) tags by default (--display-info)
+ #  NB: this cannot be used with display-level
+ display-info=yes
+ 
+ # Ignore all overrides (--no-override)
+ #  NB: called "overrides" in the config file
+ #      and has inverted value!
+ overrides = no
+ 
+ # Automatically determine if color should be used
+ color = auto
+
 =head1 EXIT STATUS
 
 =over 4

-- 
Debian package checker