[debhelper-devel] [debhelper] 01/01: Spelling fixes
Niels Thykier
nthykier at moszumanska.debian.org
Fri Oct 13 17:53:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 6b10472023a991b09a14bbefb7709cfd421fffe3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Thu Oct 12 23:43:11 2017 +0300
Spelling fixes
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 3 +++
dh_gencontrol | 2 +-
doc/PROGRAMMING | 4 ++--
lib/Debian/Debhelper/Buildsystem.pm | 6 +++---
lib/Debian/Debhelper/Dh_Lib.pm | 4 ++--
t/buildsystems/buildsystem_tests.t | 2 +-
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8965c5b..19884f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ debhelper (10.9.2) UNRELEASED; urgency=medium
* qmake.pm: Remove unnecessary "-nocache" parameter.
(Closes: #878427, LP: #1206234)
+ [ Ville Skyttä ]
+ * Fix a number of spelling mistakes. (Closes: #878325)
+
-- Niels Thykier <niels at thykier.net> Wed, 11 Oct 2017 05:32:09 +0000
debhelper (10.9.1) unstable; urgency=medium
diff --git a/dh_gencontrol b/dh_gencontrol
index ef388cf..bdbf178 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -114,7 +114,7 @@ on_pkgs_in_parallel {
my $component = '';
if ($section =~ m{^(.*)/[^/]+$}) {
$component = "${1}/";
- # This should not happen, but lets not propogate the error
+ # This should not happen, but lets not propagate the error
# if does.
$component = '' if $component eq 'main/';
}
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 42ad1ab..b76bc9e 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -20,7 +20,7 @@ are run, so the important stuff is clearly visible.
An exception to above rule are dh_auto_* commands and dh itself. They will
also print the commands interacting with the upstream build system and which
-of the simple debhelper programms are called. (i.e. print what a traditional
+of the simple debhelper programs are called. (i.e. print what a traditional
non-dh(1) using debian/rules would print but nothing else).
Debhelper programs should accept all options listed in the "SHARED
@@ -324,7 +324,7 @@ restore_file_on_clean($file)
CAVEAT: This *cannot* undo arbitrary "rm -fr"'ing. The dir,
which is/was in $file, must be present when dh_clean is called.
make_symlink($src, $dest, $tmp)
- Creates a Policy compliant sytem link called $dest pointing to
+ Creates a Policy compliant system link called $dest pointing to
$src. If $tmp is given, then $tmp will be prefixed to $dest when
creating the actual symlink.
install_dh_config_file($src, $dest[, $mode])
diff --git a/lib/Debian/Debhelper/Buildsystem.pm b/lib/Debian/Debhelper/Buildsystem.pm
index 8f7939d..4d2ee72 100644
--- a/lib/Debian/Debhelper/Buildsystem.pm
+++ b/lib/Debian/Debhelper/Buildsystem.pm
@@ -31,7 +31,7 @@ sub DESCRIPTION {
error("class lacking a DESCRIPTION");
}
-# Default build directory. Can be overriden in the derived
+# Default build directory. Can be overridden in the derived
# class if really needed.
sub DEFAULT_BUILD_DIRECTORY {
"obj-" . dpkg_architecture_value("DEB_HOST_GNU_TYPE");
@@ -416,9 +416,9 @@ sub post_building_step {
# building, testing, install and cleaning source packages.
# In case of failure, the method may just error() out.
#
-# These methods should be overriden by derived classes to
+# These methods should be overridden by derived classes to
# implement build system specific steps needed to build the
-# source. Arbitary number of custom step arguments might be
+# source. Arbitrary number of custom step arguments might be
# passed. Default implementations do nothing.
sub configure {
my $this=shift;
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index e71d8e1..167d5d2 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -1303,8 +1303,8 @@ sub sourcepackage {
}
# Returns a list of packages in the control file.
-# Pass "arch" or "indep" to specify arch-dependant (that will be built
-# for the system's arch) or independant. If nothing is specified,
+# Pass "arch" or "indep" to specify arch-dependent (that will be built
+# for the system's arch) or independent. If nothing is specified,
# returns all packages. Also, "both" returns the union of "arch" and "indep"
# packages.
#
diff --git a/t/buildsystems/buildsystem_tests.t b/t/buildsystems/buildsystem_tests.t
index ac39b6d..4f1cc53 100755
--- a/t/buildsystems/buildsystem_tests.t
+++ b/t/buildsystems/buildsystem_tests.t
@@ -148,7 +148,7 @@ test_buildsystem_paths_api($bs, "no builddir, sourcedir=autoconf", \%tmp);
# Prefer out of source tree building when
# sourcedir=builddir=autoconf hence builddir should be dropped.
$bs->prefer_out_of_source_building(builddir => "autoconf");
-test_buildsystem_paths_api($bs, "out of source prefered, sourcedir=builddir", \%tmp);
+test_buildsystem_paths_api($bs, "out of source preferred, sourcedir=builddir", \%tmp);
# builddir=bld/dir, sourcedir=autoconf. Should be the same as sourcedir=autoconf.
$bs = $BS_CLASS->new(builddir => "bld/dir", sourcedir => "autoconf");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list