[SCM] Debian package checker branch, master, updated. 2.2.18-69-gb6e16e6

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit b418a47f9ad7ca044db9947cd786749d111458d0
Author: Russ Allbery <rra@debian.org>
Date:   Fri Dec 25 12:14:32 2009 -0800

    Minor tweaks to --help support for lintian-info
    
    Document the new flag in the man page.  Shorten the usage summary to be
    under 80 columns.  Add the annotate option to the invocation summary.
    Add a changelog entry.

diff --git a/debian/changelog b/debian/changelog
index fcbec02..32d0b64 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,9 @@ lintian (2.3.0) UNRELEASED; urgency=low
       module.
     + [RA] Add option -F or --ftp-master-rejects which only checks tags
       that could result in an automatic upload reject.
+  * frontend/lintian-info:
+    + [RA] Add -h/--help option.  Patch from gregor herrmann.
+      (Closes: #558214)
 
   * lib/Lintian/Check.pm:
     + [RA] Use Lintian::Tags instead of Tags.
@@ -154,6 +157,8 @@ lintian (2.3.0) UNRELEASED; urgency=low
     + [RA] Document -F (--ftp-master-rejects).
     + [RA] Add ocaml checker script.
     + [RA] Add ar-info collection script.
+  * man/lintian-info.1:
+    + [RA] Add -h (--help).
 
   * private/refresh-ftp-master-tags:
     + [RA] Script to refresh data about automatic package rejects.
diff --git a/frontend/lintian-info b/frontend/lintian-info
index 051934f..bf7284b 100755
--- a/frontend/lintian-info
+++ b/frontend/lintian-info
@@ -50,10 +50,11 @@ GetOptions('annotate|a' => \$annotate, 'tags|t' => \$tags, 'help|h' => \$help)
 if ($help) {
     print <<"EOT";
 Usage: lintian-info [log-file...] ...
+       lintian-info --annotate [overrides ...]
        lintian-info --tags tag ...
 
 Options:
-    -a, --annotate    display verbose information about provided Lintian overrides
+    -a, --annotate    display descriptions of tags in Lintian overrides
     -t, --tags        display tag descriptions
 EOT
 
diff --git a/man/lintian-info.1 b/man/lintian-info.1
index a504d3c..cc5b15b 100644
--- a/man/lintian-info.1
+++ b/man/lintian-info.1
@@ -66,6 +66,10 @@ search the input for lines formatted like Lintian override entries.  For
 each one that was found, display verbose information about that tag.
 
 .TP
+.BR \-h ", " \-\-help
+Display usage information and exit.
+
+.TP
 .BR \-t ", " \-\-tags
 Rather than treating them as log file names, treat any command-line
 options as tag names and display the descriptions of each tag.

-- 
Debian package checker