[SCM] Debian package checker branch, master, updated. 2.5.12-13-g7b947e6
The following commit has been merged in the master branch:
commit 0af16e46420c0c1210f3c537ef2a359ae4bed923
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 20 14:12:29 2013 +0200
lib,doc: Fix a number of spelling mistakes
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index 89c12b1..3495dbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ lintian (2.5.13) UNRELEASED; urgency=low
+ [NT] Replace makeshift "is_ancestor_of" check with the
one from L::Util.
+ * doc/tutorial/**/*.pod:
+ + [NT] Fix a number of spelling mistakes in the POD.
+
+ * lib/*:
+ + [NT] Fix a number of spelling mistakes in the POD.
* lib/Lintian/Util.pm:
+ [NT] Fix a race condition in touch_file.
+ [NT] Add sanity check in perm2oct for bad permission
diff --git a/doc/tutorial/Lintian/Tutorial/TestSuite.pod b/doc/tutorial/Lintian/Tutorial/TestSuite.pod
index 6871e5d..3aa4c6d 100644
--- a/doc/tutorial/Lintian/Tutorial/TestSuite.pod
+++ b/doc/tutorial/Lintian/Tutorial/TestSuite.pod
@@ -30,7 +30,7 @@ tests> for the available options.
The test suite respects the "DEB_BUILD_OPTIONS=parallel=n", though "n"
denotes the amount of "worker" threads. The test runner will
generally have 2 threads more than that. Also each "worker" will run
-lintian, which parallelizes its unpacking as well.
+lintian, which runs multiple unpacking jobs in parallel as well.
In case you are wondering about the 2 extra threads in the test
runner, the first of them is the "coordinator"-thread (which will
diff --git a/doc/tutorial/Lintian/Tutorial/WritingChecks.pod b/doc/tutorial/Lintian/Tutorial/WritingChecks.pod
index 981703d..e700287 100644
--- a/doc/tutorial/Lintian/Tutorial/WritingChecks.pod
+++ b/doc/tutorial/Lintian/Tutorial/WritingChecks.pod
@@ -12,7 +12,7 @@ Lintian check. Most of the work is in writing the two files:
checks/<my-check>
checks/<my-check>.desc
-And then either adding a Lintian profile or extending an exisiting
+And then either adding a Lintian profile or extending an existing
one.
=head1 DESCRIPTION
@@ -23,7 +23,7 @@ check. In this tutorial, we will assume the name of the check to be
written is called "deb/pkg-check".
The tutorial will work with a "binary" and "udeb" check. Checking
-source packages works in a similar fasion.
+source packages works in a similar fashion.
=head2 Create a check I<.desc> file
@@ -92,7 +92,7 @@ L<Lintian::Collect::Source>.
(Currently it is the same as $proc->info)
-=item $proc - Basic metadata about the pacakage
+=item $proc - Basic metadata about the package
This is an instance of L<Lintian::Processable> and is useful for
trivially obtaining very basic package metadata. Particularly, name
@@ -135,7 +135,7 @@ The full example being:
}
Assuming there is a tag called "deb-pkg-check-works" in your I<.desc>
-file, the above will faithfully emit said tag for all pakages
+file, the above will faithfully emit said tag for all packages
processed by this check.
Emitting a tag is fairly simple; the hard part is emitting exactly
@@ -186,7 +186,7 @@ An alternative route is using a table like:
Notice that Lintian automatically strips leading and trailing spaces
on the I<first> line in a field. It also strips trailing spaces from
-all other lines, but leading spaces and the " ."-continutation markers
+all other lines, but leading spaces and the " ."-continuation markers
are kept as is.
We will use the second here:
@@ -222,11 +222,11 @@ We will use the second here:
So far so good.
-=head2 Checking dependecies
+=head2 Checking dependencies
Lintian can do some checking of dependencies. For most cases it works
similar to a normal dependency check, but keep in mind that Lintian
-uses I<pure> logic to determine if dependencies are satisifies (i.e. it
+uses I<pure> logic to determine if dependencies are satisfies (i.e. it
will not look up relations like Provides for you).
Suppose you wanted all packages with a multi-arch "same" field to
@@ -237,8 +237,8 @@ this.
The $info->relation returns an instance of L<Lintian::Relation>. This
object as an "implies" method that can be used to check if a package
has an explicit dependency. Note that "implies" actually checks if
-one relations "implies" another (i.e. if you satisified relationA then
-you definitely also satisified relationB).
+one relations "implies" another (i.e. if you satisfied relationA then
+you definitely also satisfied relationB).
Like with the "field"-method, field names have to be given in all
lowercase. But "relation" will never return C<undef> (not even if the
diff --git a/lib/Lintian/Architecture.pm b/lib/Lintian/Architecture.pm
index 517591a..ad4dd53 100644
--- a/lib/Lintian/Architecture.pm
+++ b/lib/Lintian/Architecture.pm
@@ -41,7 +41,7 @@ our (@EXPORT_OK, %EXPORT_TAGS);
=head1 NAME
-Lintian::Architecture -- Lintian API for handling architectures and wilcards
+Lintian::Architecture -- Lintian API for handling architectures and wildcards
=head1 SYNOPSIS
diff --git a/lib/Lintian/Collect/Binary.pm b/lib/Lintian/Collect/Binary.pm
index 5524c04..a43f120 100644
--- a/lib/Lintian/Collect/Binary.pm
+++ b/lib/Lintian/Collect/Binary.pm
@@ -464,7 +464,7 @@ is its "Major class version" for Java or "-" if it is not a class file.
=item error
-If it exists, this is an error that occured during reading of the zip
+If it exists, this is an error that occurred during reading of the zip
file. If it exists, it is unlikely that the other fields will be
present.
diff --git a/lib/Lintian/Collect/Group.pm b/lib/Lintian/Collect/Group.pm
index 80ac6ed..8d5dc86 100644
--- a/lib/Lintian/Collect/Group.pm
+++ b/lib/Lintian/Collect/Group.pm
@@ -27,7 +27,7 @@ use Carp qw(croak);
=head1 NAME
-Lintian::Collect::Group - Lintain interface to group data collection
+Lintian::Collect::Group - Lintian interface to group data collection
=head1 SYNOPSIS
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index a816e6e..dad9d5f 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -563,7 +563,7 @@ sub debfiles {
=item index (FILE)
For the general documentation of this method, please refer to the
-documenation of it in
+documentation of it in
L<Lintian::Collect::Package|Lintian::Collect::Package/index (FILE)>.
The index of a source package is not very well defined for non-native
@@ -579,7 +579,7 @@ tarball.
IMPLEMENTATION DETAIL/CAVEAT: Lintian currently (2.5.11) generates
this by running "find(1)" after unpacking the the source package.
-This has three consequnces.
+This has three consequences.
First it means that (original) owner/group data is lost; Lintian
inserts "root/root" here. This is usually not a problem as
diff --git a/lib/Lintian/Command.pm b/lib/Lintian/Command.pm
index 2bd2fc9..e619cb9 100644
--- a/lib/Lintian/Command.pm
+++ b/lib/Lintian/Command.pm
@@ -104,9 +104,9 @@ after the call.
=item out_append
-STDOUT of all forked childs, cannot be used with out and should only be
+STDOUT of all forked children, cannot be used with out and should only be
used with files. Unlike out, this appends the output to the file
-instread of truncating the file.
+instead of truncating the file.
=item pipe_out
@@ -116,13 +116,13 @@ process to end properly.
=item err
-STDERR of all forked childs. Defaults to STDERR of the parent.
+STDERR of all forked children. Defaults to STDERR of the parent.
=item err_append
-STDERR of all forked childs, cannot be used with err and should only be
+STDERR of all forked children, cannot be used with err and should only be
used with files. Unlike err, this appends the output to the file
-instread of truncating the file.
+instead of truncating the file.
=item pipe_err
@@ -344,7 +344,7 @@ sub kill {
=head2 C<done($opts)>
-Check if a process and its childs are done. This is useful when one wants to
+Check if a process and its children are done. This is useful when one wants to
know whether reap() can be called without blocking waiting for the process.
It takes a single hash reference as returned by spawn.
diff --git a/lib/Lintian/Command/Simple.pm b/lib/Lintian/Command/Simple.pm
index ae23c60..e52c5bb 100644
--- a/lib/Lintian/Command/Simple.pm
+++ b/lib/Lintian/Command/Simple.pm
@@ -209,7 +209,7 @@ sub wait_any {
=item kill_all(hashref[, signal])
In a similar way to wait_any(), it is possible to pass a hash
-reference to kill_all(). It will then kill all of the proceses
+reference to kill_all(). It will then kill all of the processes
(default signal being "TERM") followed by a reaping of the processes.
All reaped processes (and their values) will be removed from the set.
diff --git a/lib/Lintian/Data.pm b/lib/Lintian/Data.pm
index efdb694..610e4d1 100644
--- a/lib/Lintian/Data.pm
+++ b/lib/Lintian/Data.pm
@@ -248,7 +248,7 @@ for the class method new.
The sub will be called once for each key/pair with three arguments,
KEY, VALUE and CURVALUE. The first two are the key/value pair parsed
-from the data file and CURVALUE is current value assoicated with the
+from the data file and CURVALUE is current value associated with the
key. CURVALUE will be C<undef> the first time the sub is called with
that KEY argument.
diff --git a/lib/Lintian/Lab/Entry.pm b/lib/Lintian/Lab/Entry.pm
index 6147e9a..712da12 100644
--- a/lib/Lintian/Lab/Entry.pm
+++ b/lib/Lintian/Lab/Entry.pm
@@ -77,7 +77,7 @@ use constant LAB_ENTRY_FORMAT => 1;
=item new_from_metadata (PKG_TYPE, METADATA, LAB, BASEDIR)
-Overrides same contructor in Lintian::Processable.
+Overrides same constructor in Lintian::Processable.
Used by L<Lintian::Lab> to load an existing entry from the lab.
@@ -339,7 +339,7 @@ sub coll_version {
Returns a truth value if the collection COLL has been completed and
its version is at least VERSION. The versions are assumed to be
-integers (the comparision is performed with ">=").
+integers (the comparison is performed with ">=").
This returns 0 if the collection COLL has not been marked as
finished.
diff --git a/lib/Lintian/Lab/Manifest.pm b/lib/Lintian/Lab/Manifest.pm
index b063a7c..3900adb 100644
--- a/lib/Lintian/Lab/Manifest.pm
+++ b/lib/Lintian/Lab/Manifest.pm
@@ -320,7 +320,7 @@ Otherwise, the keys are (in general and in order):
=item version
-=item architeture
+=item architecture
except for source packages
diff --git a/lib/Lintian/Lab/ManifestDiff.pm b/lib/Lintian/Lab/ManifestDiff.pm
index 61eb1f6..18611df 100644
--- a/lib/Lintian/Lab/ManifestDiff.pm
+++ b/lib/Lintian/Lab/ManifestDiff.pm
@@ -80,24 +80,24 @@ sub _new {
=item $diff->added
-Returns a list ref containing the keys of the elements that has been added.
+Returns a listref containing the keys of the elements that has been added.
-Each element is a list of keys; this list (deref'ed) can be used with the
-manifest's get method to look up the item.
+Each element is a listref of keys; this list (when dereferenced) can be
+used with the manifest's get method to look up the item.
=item $diff->removed
-Returns a list ref containing the keys of the elements that has been removed.
+Returns a listref containing the keys of the elements that has been removed.
-Each element is a list of keys; this list (deref'ed) can be used with the
-manifest's get method to look up the item.
+Each element is a listref of keys; this list (when dereferenced) can
+be used with the manifest's get method to look up the item.
=item $diff->changed
-Returns a list ref containing the keys of the elements that has been changed.
+Returns a listref containing the keys of the elements that has been changed.
-Each element is a list of keys; this list (deref'ed) can be used with the
-manifest's get method to look up the item.
+Each element is a listref of keys; this list (when dereferenced) can
+be used with the manifest's get method to look up the item.
=item $diff->nlist
diff --git a/lib/Lintian/Output.pm b/lib/Lintian/Output.pm
index be84a2c..30340eb 100644
--- a/lib/Lintian/Output.pm
+++ b/lib/Lintian/Output.pm
@@ -382,7 +382,7 @@ only available as instance methods. The methods mentioned in
L</CLASS/INSTANCE METHODS>
usually only check whether they should do anything at all (according
to the values of verbosity_level and debug) and then call one of
-the following methods to do the actual printing. Allmost all of them
+the following methods to do the actual printing. Almost all of them
finally call _print() to do that. This convoluted scheme is necessary
to be able to use the methods above as class methods and still make
the behaviour overridable in subclasses.
diff --git a/lib/Lintian/Processable.pm b/lib/Lintian/Processable.pm
index 5d95f6f..10ab924 100644
--- a/lib/Lintian/Processable.pm
+++ b/lib/Lintian/Processable.pm
@@ -224,7 +224,7 @@ to less dangerous (but possibly invalid) values.
=item $proc->identifier
-Proceduces an identifier for this processable. The identifier is
+Produces an identifier for this processable. The identifier is
based on the type, name, version and architecture of the package.
=cut
@@ -263,7 +263,7 @@ Discard the info element, so the memory used by it can be reclaimed.
Mostly useful when checking a lot of packages (e.g. on lintian.d.o).
Note: By default this does nothing, but it may (and should) be
-overriden by sub-classes.
+overridden by sub-classes.
=cut
diff --git a/lib/Lintian/ProcessableGroup.pm b/lib/Lintian/ProcessableGroup.pm
index 6d42d5d..9d41eed 100644
--- a/lib/Lintian/ProcessableGroup.pm
+++ b/lib/Lintian/ProcessableGroup.pm
@@ -57,7 +57,7 @@ and one changes package per set, but multiple binary packages
Creates a group and optionally add all processables from CHANGES.
If the LAB parameter is given, all processables added to this group
-will bestored as a L<lab entry|Lintian::Lab::Entry> from LAB.
+will be stored as a L<lab entry|Lintian::Lab::Entry> from LAB.
=cut
diff --git a/lib/Lintian/Relation.pm b/lib/Lintian/Relation.pm
index 6113443..e944f0f 100644
--- a/lib/Lintian/Relation.pm
+++ b/lib/Lintian/Relation.pm
@@ -659,7 +659,7 @@ sub implies_inverse {
Returns the textual form of a relationship. This converts the internal
form back into the textual representation and returns that, not the
original argument, so the spacing is standardized. Returns undef on
-internal faliures (such as an object in an unexpected format).
+internal failures (such as an object in an unexpected format).
=cut
@@ -782,7 +782,7 @@ Visit clauses or predicates of this relation. Each clause or
predicate is passed to CODE as first argument and will be available as
C<$_>.
-The optional bitmask paramater, FLAGS, can be used to control what is
+The optional bitmask parameter, FLAGS, can be used to control what is
visited and such. If FLAGS is not given, it defaults to
VISIT_PRED_NAME. The possible values of FLAGS are:
diff --git a/lib/Lintian/Tag/Info.pm b/lib/Lintian/Tag/Info.pm
index 322d394..72b2d2d 100644
--- a/lib/Lintian/Tag/Info.pm
+++ b/lib/Lintian/Tag/Info.pm
@@ -282,7 +282,7 @@ sub description {
=item experimental()
-Returns true if this tag is experimental, false otheriwse.
+Returns true if this tag is experimental, false otherwise.
=cut
diff --git a/lib/Lintian/Tag/Override.pm b/lib/Lintian/Tag/Override.pm
index 0d71793..bf4b75b 100644
--- a/lib/Lintian/Tag/Override.pm
+++ b/lib/Lintian/Tag/Override.pm
@@ -42,7 +42,7 @@ Lintian::Tag::Override -- Representation of an Lintian Override
=head1 DESCRIPTION
-Represents and encalsulates a Lintian Override.
+Represents a Lintian Override.
=head1 METHODS
diff --git a/lib/Lintian/Unpacker.pm b/lib/Lintian/Unpacker.pm
index 4fd5896..e63f1f9 100644
--- a/lib/Lintian/Unpacker.pm
+++ b/lib/Lintian/Unpacker.pm
@@ -74,7 +74,7 @@ available via L<Lintian::Collect>.
Creates a new unpacker.
-COLLMAP is a L<Lintian::DepMap::Properties> decribing the dependencies
+COLLMAP is a L<Lintian::DepMap::Properties> describing the dependencies
between the collections. Each node in COLLMAP must have a
L<Lintian::CollScript> as property.
diff --git a/lib/Lintian/Util.pm b/lib/Lintian/Util.pm
index eb08378..2bb0a32 100644
--- a/lib/Lintian/Util.pm
+++ b/lib/Lintian/Util.pm
@@ -130,12 +130,12 @@ Most subs are imported only on request.
At first glance, this module appears to contain several debian control
parsers. In practise, there is only one real parser
-(L</visit_dpkg_paragraph>) - the rest are convience functions around
+(L</visit_dpkg_paragraph>) - the rest are convenience functions around
it.
If you have very large files (e.g. Packages_amd64), you almost
certainly want L</visit_dpkg_paragraph>. Otherwise, one of the
-convience methods are probably what you are looking for.
+convenience functions are probably what you are looking for.
=over 4
@@ -188,7 +188,7 @@ file is considered a syntax error.
=item $PKGNAME_REGEX
Regular expression that matches valid package names. The expression
-is not anchored and does not enforce any "boundry" characters.
+is not anchored and does not enforce any "boundary" characters.
=cut
@@ -215,7 +215,7 @@ return, LINES will be populated to the line numbers where a given
paragraph "started" (i.e. the line number of first field in the
paragraph).
-This is a convience sub around L</visit_dpkg_paragraph> and can
+This is a convenience sub around L</visit_dpkg_paragraph> and can
therefore produce the same errors as it. Please see
L</visit_dpkg_paragraph> for the finer semantics of how the
control file is parsed.
@@ -255,7 +255,7 @@ visit_dpkg_paragraph will require the PGP headers to be correct (if
present) and require that the entire file is covered by the signature.
However, it will I<not> validate the signature (in fact, the contents
of the PGP SIGNATURE part can be empty). The signature should be
-validated separatedly.
+validated separately.
visit_dpkg_paragraph will pass paragraphs to CODE as they are
completed. If CODE can process the paragraphs as they are seen, very
@@ -829,7 +829,7 @@ sub clean_env {
Translates PERM to an octal permission. PERM should be a string describing
the permissions as done by I<tar t> or I<ls -l>. That is, it should be a
-string like "-rwr--r--".
+string like "-rw-r--r--".
If the string does not appear to be a valid permission, it will cause
a trappable error.
@@ -883,7 +883,7 @@ sub perm2oct {
=item delete_dir (ARGS)
-Convient way of calling I<rm -fr ARGS>.
+Convenient way of calling I<rm -fr ARGS>.
=cut
@@ -893,7 +893,7 @@ sub delete_dir {
=item copy_dir (ARGS)
-Convient way of calling I<cp -a ARGS>.
+Convenient way of calling I<cp -a ARGS>.
=cut
@@ -981,7 +981,7 @@ sub touch_file {
=item fail (MSG[, ...])
Use to signal an internal error. The argument(s) will used to print a
-dianostic message to the user.
+diagnostic message to the user.
If multiple arguments are given, they will be merged into a single
string (by join (' ', @_)). If only one argument is given it will be
diff --git a/lib/Test/Lintian.pm b/lib/Test/Lintian.pm
index afcd7fc..bc6014a 100644
--- a/lib/Test/Lintian.pm
+++ b/lib/Test/Lintian.pm
@@ -453,7 +453,7 @@ first argument. The following key/value pairs are defined:
The value is assumed to be a regex (or a string describing a regex).
Any tag matching this regex will be excluded from this test and is
-assumed to be implemented (regardless of whather that is true or not).
+assumed to be implemented (regardless of whether that is true or not).
This is useful for avoiding false-positives with cases like:
--
Debian package checker
Reply to: