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

[SCM] Debian package checker branch, master, updated. 2.4.3-209-gbf00432



The following commit has been merged in the master branch:
commit bf00432df9ba8b23a67e433a66fc1de3a6433b6d
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 30 00:35:00 2011 +0100

    lintian.pod.in: sorted options and added missing option
    
    Be a bit more advertising with the deprecation of UNPACK LEVELS
    in the pod file.  Also added missing changelog entry about
    replacing the man pages with pod files.
    
      * man/*:
        + [NT] Rewrote the man pages in pod.  (Closes: #600906)

diff --git a/debian/changelog b/debian/changelog
index ebc9ea6..8cd1b8f 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -190,6 +190,9 @@ lintian (2.5.0) UNRELEASED; urgency=low
     + [NT] Pre-sort file index and file info to avoid sorting it
       repeatedly in the checks.  (Closes: #605844)
 
+  * man/*:
+    + [NT] Rewrote the man pages in pod.  (Closes: #600906)
+
   * t/tests/{rules-not-makefile,scripts-missing-dep}:
     + [NT] Added new tests. (Closes: #607731)
 
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 4358ce5..b42b24a 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -57,14 +57,6 @@ Actions of the lintian command: (Only one action can be specified per invocation
 
 =over 4
 
-=item B<-S>, B<--setup-lab>
-
-Set up or update the laboratory.
-
-=item B<-R>, B<--remove-lab>
-
-Remove the laboratory directory.
-
 =item B<-c>, B<--check>
 
 Run all checks over the specified packages.  This is the default action.
@@ -75,6 +67,27 @@ Run only the specified checks.  You can either specify the name of the
 check script or the abbreviation.  For details, see the L</CHECKS> section
 below.
 
+=item B<-F>, B<--ftp-master-rejects>
+
+Run only the checks that issue tags that result in automatic rejects
+from the Debian upload queue.  The list of such tags is refreshed with
+each Lintian release, so may be slightly out of date if it has changed
+recently.  This option does not, as yet, ignore overrides for fatal
+tags for which overrides aren't allowed.
+
+=item B<-r>, B<--remove>
+
+Clean up the lintian directory of the specified packages up to the
+current unpack level.  The default unpack level is 0 for this option.
+
+=item B<-R>, B<--remove-lab>
+
+Remove the laboratory directory.
+
+=item B<-S>, B<--setup-lab>
+
+Set up or update the laboratory.
+
 =item B<-T> tag1,tag2,..., B<--tags> tag1,tag2,...
 
 Run only the checks that issue the requested tags.  The tests for
@@ -88,30 +101,20 @@ file.  Blank lines and lines beginning with # are ignored.  All other
 lines are taken to be tag names or comma-separated lists of tag names
 to (potentially) issue.
 
-=item B<-F>, B<--ftp-master-rejects>
-
-Run only the checks that issue tags that result in automatic rejects
-from the Debian upload queue.  The list of such tags is refreshed with
-each Lintian release, so may be slightly out of date if it has changed
-recently.  This option does not, as yet, ignore overrides for fatal
-tags for which overrides aren't allowed.
-
-=item B<-X> chk1,chk2,..., B<--dont-check-part> chk1,chk2,...
-
-Run all but the the specified checks.  You can either specify the name
-of the check script or the abbreviation.  For details, see the
-L</CHECKS> section below.
-
 =item B<-u>, B<--unpack>
 
 Unpack the specified packages up to the current unpack level.  The
 default and only unpack level is 1 for this option.  See the L</UNPACK
 LEVELS> section below.
 
-=item B<-r>, B<--remove>
+Note in this option will also run all collections.  See the
+L</COLLECTION> section below.
 
-Clean up the lintian directory of the specified packages up to the
-current unpack level.  The default unpack level is 0 for this option.
+=item B<-X> chk1,chk2,..., B<--dont-check-part> chk1,chk2,...
+
+Run all but the the specified checks.  You can either specify the name
+of the check script or the abbreviation.  For details, see the
+L</CHECKS> section below.
 
 =back
 
@@ -119,31 +122,31 @@ General options:
 
 =over 4
 
-=item B<-h>, B<--help>
+=item B<-d>, B<--debug>
 
-Display usage information and exit.
+Display debugging messages. (Implies B<-v>).
 
-=item B<-V>, B<--version>
+=item B<-h>, B<--help>
 
-Display lintian version number and exit.
+Display usage information and exit.
 
-=item B<--print-version>
+=item B<-q>, B<--quiet>
 
-Print unadorned version number and exit.
+Suppress all informational messages.  Currently, the only message this
+suppresses is the message at the end of the run giving the total count
+of overrides.
 
 =item B<-v>, B<--verbose>
 
 Display verbose messages.
 
-=item B<-d>, B<--debug>
+=item B<-V>, B<--version>
 
-Display debugging messages. (Implies B<-v>).
+Display lintian version number and exit.
 
-=item B<-q>, B<--quiet>
+=item B<--print-version>
 
-Suppress all informational messages.  Currently, the only message this
-suppresses is the message at the end of the run giving the total count
-of overrides.
+Print unadorned version number and exit.
 
 =back
 
@@ -151,16 +154,27 @@ Behaviour options for B<lintian>.
 
 =over 4
 
-=item B<-i>, B<--info>
+=item B<--allow-root>
 
-Print explanatory information about each problem discovered in
-addition to the lintian error tags. To print a long tag description
-without running lintian, see L<lintian-info(1)>..
+Override lintian's warning when it is run with superuser privileges.
 
-=item B<-I>, B<--display-info>
+=item B<--color> (never|always|auto|html)
 
-Display informational ("I:") tags as well.  They are normally
-suppressed.  (This is equivalent to B<-L> ">=wishlist").
+Whether to colorize tags in lintian output based on their severity.
+The default is "never", which never uses color.  "always" will always
+use color, "auto" will use color only if the output is going to a
+terminal, and "html" will use HTML E<lt>spanE<gt> tags with a color style
+attribute (instead of ANSI color escape sequences).
+
+=item B<--display-source> X
+
+Only display tags from the source X (e.g. the Policy Manual or the
+Developer Reference).  This option can be used multiple times to
+add additional sources.  Example sources are "policy" or "devref"
+being the Policy Manual and the Developer Reference (respectively).
+
+The entire list of sources can be found in
+I<$LINTIAN_ROOT/data/output/manual-references>
 
 =item B<-E>, B<--display-experimental>
 
@@ -173,15 +187,39 @@ and might still give surprising results.  Feel free to ignore
 Experimental messages that do not seem to make sense, though of course
 bug reports are always welcomed (particularly if they include fixes).
 
-=item B<--pedantic>
+=item B<--fail-on-warnings>
 
-Display pedantic ("P:") tags as well.  They are normally suppressed.
+By default, B<lintian> exits with 0 status if only warnings were
+found.  If this flag is given, exit with a status of 1 if either
+warnings or errors are found.
 
-Pedantic tags are Lintian at its most pickiest and include checks for
-particular Debian packaging styles and checks that many people
-disagree with.  Expect false positives and Lintian tags that you don't
-consider useful if you use this option.  Adding overrides for pedantic
-tags is probably not worth the effort.
+=item B<-i>, B<--info>
+
+Print explanatory information about each problem discovered in
+addition to the lintian error tags. To print a long tag description
+without running lintian, see L<lintian-info(1)>.
+
+=item B<-I>, B<--display-info>
+
+Display informational ("I:") tags as well.  They are normally
+suppressed.  (This is equivalent to B<-L> ">=wishlist").
+
+=item B<--keep-lab>
+
+By default, temporary labs will be removed after lintian is finished.
+Specifying this options will leave the lab behind, which might be
+useful for debugging purposes.  You can find out where the temporary
+lab is located by running lintian with the B<--verbose> option.
+
+For static (non-temporary) labs this option causes Lintian to skip
+the automatical clean up of some collections.
+
+=item B<-l> n, B<--unpack-level> n
+
+Set unpack level to I<n>.  See the L</UNPACK LEVELS> section, below.
+
+Note that the UNPACK LEVEL system is deprecated in favour of the
+L</COLLECTION> system.
 
 =item B<-L> [+|-|=][>=|>|<|<=][S|C|S/C], B<--display-level> [+|-|=][>=|>|<|<=][S|C|S/C]
 
@@ -192,87 +230,67 @@ possible, wild-guess), or both (S/C).  The default settings are
 equivalent to B<-L> ">=important" B<-L> "+>=normal/possible" B<-L>
 +minor/certain).
 
-=item B<--suppress-tags> tag1,tag2,...
-
-Suppress the listed tags.  They will not be reported if they occur and
-will not affect the exit status of Lintian.
+=item B<-m>, B<--md5sums>, B<--checksums>
 
-=item B<--suppress-tags-from-file> file
+Check checksums when processing a .changes file.  Normally, Lintian
+only checks the checksums for .dsc files when processing a .changes
+file.
 
-Suppress all tags listed in the given file.  Blank lines and lines
-beginning with # are ignored.  All other lines are taken to be tag
-names or comma-separated lists of tag names to suppress.  The
-suppressed tags will not be reported if they occur and will not affect
-the exit status of Lintian.
+=item B<-o>, B<--no-override>
 
-=item B<-l> n, B<--unpack-level> n
+Don't use the overrides file.
 
-Set unpack level to I<n>.  See the L</UNPACK LEVELS> section, below.
+=item B<--pedantic>
 
-=item B<-o>, B<--no-override>
+Display pedantic ("P:") tags as well.  They are normally suppressed.
 
-Don't use the overrides file.
+Pedantic tags are Lintian at its most pickiest and include checks for
+particular Debian packaging styles and checks that many people
+disagree with.  Expect false positives and Lintian tags that you don't
+consider useful if you use this option.  Adding overrides for pedantic
+tags is probably not worth the effort.
 
 =item B<--show-overrides>
 
 Output tags that have been overridden.
 
-=item B<--color> (never|always|auto|html)
+=item B<--suppress-tags> tag1,tag2,...
 
-Whether to colorize tags in lintian output based on their severity.
-The default is "never", which never uses color.  "always" will always
-use color, "auto" will use color only if the output is going to a
-terminal, and "html" will use HTML E<lt>spanE<gt> tags with a color style
-attribute (instead of ANSI color escape sequences).
+Suppress the listed tags.  They will not be reported if they occur and
+will not affect the exit status of Lintian.
+
+=item B<--suppress-tags-from-file> file
+
+Suppress all tags listed in the given file.  Blank lines and lines
+beginning with # are ignored.  All other lines are taken to be tag
+names or comma-separated lists of tag names to suppress.  The
+suppressed tags will not be reported if they occur and will not affect
+the exit status of Lintian.
 
 =item B<-U> info1,info2,..., B<--unpack-info> info1,info2,...
 
 Collect information info1, info2, etc. even if these are not required
 by the checks.
 
-=item B<-m>, B<--md5sums>, B<--checksums>
-
-Check checksums when processing a .changes file.  Normally, Lintian
-only checks the checksums for .dsc files when processing a .changes
-file.
-
-=item B<--allow-root>
-
-Override lintian's warning when it is run with superuser privileges.
-
-=item B<--fail-on-warnings>
-
-By default, B<lintian> exits with 0 status if only warnings were
-found.  If this flag is given, exit with a status of 1 if either
-warnings or errors are found.
-
-=item B<--keep-lab>
-
-By default, temporary labs will be removed after lintian is finished.
-Specifying this options will leave the lab behind, which might be
-useful for debugging purposes.  You can find out where the temporary
-lab is located by running lintian with the B<--verbose> option.
-Implies B<--unpack-level=2> unless another unpack level is specified
-directly.
-
 =back
 
 Configuration options:
 
 =over 4
 
-=item B<--cfg> configfile
+=item B<--arch> arch
 
-Read the configuration from configfile rather than the default
-locations.  This option overrides the B<LINTIAN_CFG> environment
-variable.
+When scanning for packages in the distdir, select only packages for
+architecture I<arch>.  This option overrides the B<LINTIAN_ARCH>
+environment variable and the configuration file entry of the same
+name.
 
-=item B<--lab> labdir
+=item B<--area> area
 
-Use labdir as the permanent laboratory.  This is where Lintian keeps
-information about the packages it checks.  This option overrides the
-B<LINTIAN_LAB> environment variable and the configuration file entry
-of the same name.
+When scanning for packages in the distdir, select only packages from
+the comma-separated list of archive I<areas> (e.g. main, contrib).
+This option overrides the B<LINTIAN_AREA> environment variable and the
+configuration file entry of the same name.
 
 =item B<--archivedir> archivedir
 
@@ -283,6 +301,12 @@ just single packages. This option overrides the B<LINTIAN_ARCHIVEDIR>
 environment variable and the configuration file entry of the same
 name.
 
+=item B<--cfg> configfile
+
+Read the configuration from configfile rather than the default
+locations.  This option overrides the B<LINTIAN_CFG> environment
+variable.
+
 =item B<--dist> distdir
 
 Scan for packages in the I<distdir> directory.  (See the L</FILES>
@@ -292,24 +316,17 @@ just single packages.  This option overrides the B<LINTIAN_DIST>
 environment variable and the configuration file entry of the same
 name.
 
-=item B<--area> area
-
-When scanning for packages in the distdir, select only packages from
-the comma-separated list of archive I<areas> (e.g. main, contrib).
-This option overrides the B<LINTIAN_AREA> environment variable and the
-configuration file entry of the same name.
-
 =item B<--section> area
 
 This is an old name for the B<--area> option and accepted as a synonym
 for that option.
 
-=item B<--arch> arch
+=item B<--lab> labdir
 
-When scanning for packages in the distdir, select only packages for
-architecture I<arch>.  This option overrides the B<LINTIAN_ARCH>
-environment variable and the configuration file entry of the same
-name.
+Use labdir as the permanent laboratory.  This is where Lintian keeps
+information about the packages it checks.  This option overrides the
+B<LINTIAN_LAB> environment variable and the configuration file entry
+of the same name.
 
 =item B<--root> rootdir
 
@@ -332,14 +349,6 @@ LINTIAN_DIST variable is defined in the configuration file.)
 
 The following packages listed on the command line are binary packages.
 
-=item B<-s>, B<--source>
-
-The following packages listed on the command line are source packages.
-
-=item B<--udeb>
-
-The following packages listed on the command line are udeb packages.
-
 =item B<-p> X, B<--packages-file> X
 
 Process all packages which are listed in file X.  Each package has to
@@ -352,10 +361,21 @@ package), B<package> is the package name, B<version> is the package's
 version, and B<file> is the package file name (absolute path
 specification).
 
+=item B<-s>, B<--source>
+
+The following packages listed on the command line are source packages.
+
+=item B<--udeb>
+
+The following packages listed on the command line are udeb packages.
+
 =back
 
 =head1 UNPACK LEVELS
 
+Note that the UNPACK LEVEL system is deprecated in favour of the
+L</COLLECTION> system.
+
 =over 4
 
 =item B<0 (none)>

-- 
Debian package checker


Reply to: