summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJosh Soref <jsoref@gmail.com>2017-02-26 22:14:52 +0000
committerGuillem Jover <guillem@debian.org>2017-05-06 17:49:12 +0200
commitb46c8ba6504ab341d74e61f003124d772a3f3875 (patch)
treedae22bc641a6ea6278096919164aa875b34e9fa8 /scripts
parent4137592923011e34c865d34d202a02871c3840aa (diff)
downloaddpkg-b46c8ba6504ab341d74e61f003124d772a3f3875.tar.gz
doc: Spelling fixes
Signed-off-by: Guillem Jover <guillem@debian.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Dpkg/Control/HashCore.pm2
-rw-r--r--scripts/Dpkg/Shlibs/Symbol.pm2
-rw-r--r--scripts/Dpkg/Source/Package.pm2
-rwxr-xr-xscripts/dpkg-buildpackage.pl6
-rwxr-xr-xscripts/dpkg-maintscript-helper.sh2
-rwxr-xr-xscripts/dpkg-shlibdeps.pl2
-rw-r--r--scripts/t/Dpkg_Changelog.t8
-rw-r--r--scripts/t/Dpkg_Changelog/shadow20
-rw-r--r--scripts/t/Dpkg_Checksums.t2
-rw-r--r--scripts/t/Dpkg_Dist_Files.t2
-rw-r--r--scripts/t/Dpkg_Shlibs.t6
-rw-r--r--scripts/t/Dpkg_Shlibs/ld.so.conf6
-rw-r--r--scripts/t/Dpkg_Shlibs/ld.so.conf_22
-rw-r--r--scripts/t/dpkg_buildpackage.t2
-rw-r--r--scripts/t/mk.t2
15 files changed, 33 insertions, 33 deletions
diff --git a/scripts/Dpkg/Control/HashCore.pm b/scripts/Dpkg/Control/HashCore.pm
index 21b74916c..774974fcc 100644
--- a/scripts/Dpkg/Control/HashCore.pm
+++ b/scripts/Dpkg/Control/HashCore.pm
@@ -109,7 +109,7 @@ sub new {
my $class = ref($this) || $this;
# Object is a scalar reference and not a hash ref to avoid
- # infinite recursion due to overloading hash-derefencing
+ # infinite recursion due to overloading hash-dereferencing
my $self = \{
in_order => [],
out_order => [],
diff --git a/scripts/Dpkg/Shlibs/Symbol.pm b/scripts/Dpkg/Shlibs/Symbol.pm
index 56bf17783..019e77e99 100644
--- a/scripts/Dpkg/Shlibs/Symbol.pm
+++ b/scripts/Dpkg/Shlibs/Symbol.pm
@@ -473,7 +473,7 @@ sub mark_not_found_in_library {
if ($self->{deprecated}) {
# Bump deprecated if the symbol is optional so that it
- # keeps reappering in the diff while it's missing
+ # keeps reappearing in the diff while it's missing
$self->{deprecated} = $minver if $self->is_optional();
} elsif (version_compare($minver, $self->{minver}) > 0) {
$self->{deprecated} = $minver;
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index a76784661..9a9daea78 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -599,7 +599,7 @@ sub do_build {
sub can_build {
my ($self, $dir) = @_;
- return (0, 'can_build() has not been overriden');
+ return (0, 'can_build() has not been overridden');
}
sub add_file {
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 2eea20391..dd17abb25 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -375,17 +375,17 @@ if (@rootcommand and not find_command($rootcommand[0])) {
'package, specify a command with the -r option, ' .
'or run this as root'));
} else {
- error(g_("gain-root-commmand '%s' not found"), $rootcommand[0]);
+ error(g_("gain-root-command '%s' not found"), $rootcommand[0]);
}
}
if ($check_command and not find_command($check_command)) {
- error(g_("check-commmand '%s' not found"), $check_command);
+ error(g_("check-command '%s' not found"), $check_command);
}
if ($signcommand) {
if (!find_command($signcommand)) {
- error(g_("sign-commmand '%s' not found"), $signcommand);
+ error(g_("sign-command '%s' not found"), $signcommand);
}
} elsif (($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME}) ||
($ENV{HOME} && -e "$ENV{HOME}/.gnupg")) {
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index 2366dcbdb..1a0459f75 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -127,7 +127,7 @@ abort_rm_conffile() {
mv "$CONFFILE.dpkg-remove" "$CONFFILE"
fi
if [ -e "$CONFFILE.dpkg-backup" ]; then
- echo "Reinstalling $CONFFILE that was backupped"
+ echo "Reinstalling $CONFFILE that was backed-up"
mv "$CONFFILE.dpkg-backup" "$CONFFILE"
fi
}
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 8e8cb99d7..0978f33b9 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -166,7 +166,7 @@ error(g_('error occurred while parsing %s'), 'Build-Depends/Build-Depends-Arch')
my %dependencies;
-# Statictics on soname seen in the whole run (with multiple analysis of
+# Statistics on soname seen in the whole run (with multiple analysis of
# binaries)
my %global_soname_notfound;
my %global_soname_used;
diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index 7535e24de..1369aeff3 100644
--- a/scripts/t/Dpkg_Changelog.t
+++ b/scripts/t/Dpkg_Changelog.t
@@ -94,7 +94,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
check_options( $changes, \@data,
{ count => 3, offset => 2 }, 3,
'1:2.0~rc2-2/1:2.0~rc2-1sarge3/1:2.0~rc2-1sarge2',
- 'positve count + positive offset' );
+ 'positive count + positive offset' );
check_options( $changes, \@data,
{ count => -3, offset => 4 }, 3,
'1:2.0~rc2-3/1:2.0~rc2-2/1:2.0~rc2-1sarge3',
@@ -103,7 +103,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
check_options( $changes, \@data,
{ count => 4, offset => 5 }, 2,
'1:2.0~rc2-1sarge1/1.5-1',
- 'positve count + positive offset (>max)' );
+ 'positive count + positive offset (>max)' );
check_options( $changes, \@data,
{ count => -4, offset => 2 }, 2,
'2:2.0-1/1:2.0~rc2-3',
@@ -112,7 +112,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
check_options( $changes, \@data,
{ count => 3, offset => -4 }, 3,
'1:2.0~rc2-1sarge3/1:2.0~rc2-1sarge2/1:2.0~rc2-1sarge1',
- 'positve count + negative offset' );
+ 'positive count + negative offset' );
check_options( $changes, \@data,
{ count => -3, offset => -3 }, 3,
'1:2.0~rc2-3/1:2.0~rc2-2/1:2.0~rc2-1sarge3',
@@ -121,7 +121,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
check_options( $changes, \@data,
{ count => 5, offset => -2 }, 2,
'1:2.0~rc2-1sarge1/1.5-1',
- 'positve count + negative offset (>max)' );
+ 'positive count + negative offset (>max)' );
check_options( $changes, \@data,
{ count => -5, offset => -4 }, 3,
'2:2.0-1/1:2.0~rc2-3/1:2.0~rc2-2',
diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow
index f212bc6db..f9b2236f5 100644
--- a/scripts/t/Dpkg_Changelog/shadow
+++ b/scripts/t/Dpkg_Changelog/shadow
@@ -198,7 +198,7 @@ shadow (1:4.0.3-35) unstable; urgency=low
Closes: #308662
- 124_ru: Russian updated by Yuri Kozlov
Closes: #308839
- - 129_ru: Romanian updated by Sorin Bataruc
+ - 129_ru: Romanian updated by Sorin Batariuc
Closes: #308921
- 130_zh_TW: Tradition Chinese updated by Tetralet
Closes: #311588
@@ -689,7 +689,7 @@ shadow (1:4.0.3-28.1) unstable; urgency=high
shadow (1:4.0.3-28) unstable; urgency=low
- * Fix login and passwd in preinst to avoid promts on woody upgrade,
+ * Fix login and passwd in preinst to avoid prompts on woody upgrade,
Closes: #243099
* Fix login and passwd configuration file to support common-passwd
* Apply NMU patch from Christian Perrier, Closes: #241438
@@ -705,7 +705,7 @@ shadow (1:4.0.3-27) unstable; urgency=low
shadow (1:4.0.3-26.1) unstable; urgency=low
- * NMU for Debian Installe rneeds
+ * NMU for Debian Installer needs
* Translation updates:
- Debconf:
- French. Closes: #241438
@@ -793,7 +793,7 @@ shadow (1:4.0.3-20) unstable; urgency=low
shadow (1:4.0.3-19) unstable; urgency=low
- * When creating a user account in psaswd.config, ask for full name
+ * When creating a user account in passwd.config, ask for full name
first, and make up a default username. Closes: #235386
* "No really, assume md5 passwords". Closes: #223664
@@ -953,7 +953,7 @@ shadow (1:4.0.3-7) unstable; urgency=low
* When relocating a user's home directory, don't fail and remove the new
home directory if we can't remove the old home directory for some
- reason; the results can be spectularly poort if, for instance, only
+ reason; the results can be spectacularly poor if, for instance, only
the rmdir() fails. closes: #166369
* run dh_installdebconf so base-config will work. *sigh*. closes: #166788
@@ -1001,7 +1001,7 @@ shadow (1:4.0.3-3) unstable; urgency=low
closes: #162181, #162199, #162228
* fix vipw symlink brain-damage: closes: #162218
* fix package description brain damage, closes: #139563
- * install cp{pw,gr} brain damge
+ * install cp{pw,gr} brain damage
-- Karl Ramm <kcr@debian.org> Wed, 25 Sep 2002 01:21:35 -0400
@@ -1117,7 +1117,7 @@ shadow (20000902-7) unstable; urgency=low
config scripts, but that's not getting fixed in woody.]
* Amend reference to /usr/doc in shadowconfig.8. Closes: #102804
* su should set $USER. Closes: #102995
- * userdel now deletes user groups from /etc/gshdow as well as
+ * userdel now deletes user groups from /etc/gshadow as well as
/etc/group. Closes: #99442
* grpck now has an (otherwise undocumented) -p option, so that
shadowconfig can clean up the results of the above, so the config
@@ -1206,7 +1206,7 @@ shadow (20000902-2) unstable frozen; urgency=low
doing something right. closes: #78186
* login.pam.d: made pam_nologin.so requisite. closes: #80111
* su to root seems pretty quick to me, closes: #64756
- * xmalloc.c: remove decleration of malloc, which was causing system
+ * xmalloc.c: remove declaration of malloc, which was causing system
* header conflicts. closes: #80398
-- Ben Collins <bcollins@debian.org> Sun, 31 Dec 2000 14:33:47 -0500
@@ -1290,7 +1290,7 @@ shadow (19990827-17) unstable; urgency=low
* logoutd.init.d: Check for /etc/security/time.conf, closes: #54900
* login.defs: Added note about the MAIL env option, closes: #54768
* login.pam.d,passwd.pam.d: Use new options in pam_unix.so to enable
- obsure password checks. This mimics the old behavior in pre-PAM
+ obscure password checks. This mimics the old behavior in pre-PAM
shadow, closes: #58203
* Use patch from Topi Miettinen <tom@pluto.nic.fi> to add pam session
ability to su, closes: #57526, #55873, #57532
@@ -1555,7 +1555,7 @@ shadow (19990827-1) unstable; urgency=low
- Sorry, but su (all su's) invoke the shell with -c "cmd". This is
documented, not a bug, it's a standard interface that su expects,
go fix sash's bug for not supporting it, closes: #14551
- - Acknoledged NMU: closes: #20058
+ - Acknowledged NMU: closes: #20058
- More "Fixed" bugs getting closed...CLOSED AT LAST, closes: #17593
closes: #20057, #12689
* Switched to a new build setup (dbs)
diff --git a/scripts/t/Dpkg_Checksums.t b/scripts/t/Dpkg_Checksums.t
index 6c7dc80a8..e549e640e 100644
--- a/scripts/t/Dpkg_Checksums.t
+++ b/scripts/t/Dpkg_Checksums.t
@@ -94,7 +94,7 @@ foreach my $c (@expected_checksums) {
my $ck = Dpkg::Checksums->new();
-is(scalar $ck->get_files(), 0, 'No checkums recorded');
+is(scalar $ck->get_files(), 0, 'No checksums recorded');
# Check add_from_file()
diff --git a/scripts/t/Dpkg_Dist_Files.t b/scripts/t/Dpkg_Dist_Files.t
index d43c2245e..b29973d38 100644
--- a/scripts/t/Dpkg_Dist_Files.t
+++ b/scripts/t/Dpkg_Dist_Files.t
@@ -178,7 +178,7 @@ FILES
$dist->reset();
$dist->load("$datadir/files-byhand") or error('cannot parse file');
$dist->filter(remove => sub { $_[0]->{priority} eq 'optional' });
-is($dist->output(), $expected, 'Filter remove piority optional');
+is($dist->output(), $expected, 'Filter remove priority optional');
$expected = <<'FILES';
BY-HAND-file webdocs optional
diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index 578e4e4a3..775d15eeb 100644
--- a/scripts/t/Dpkg_Shlibs.t
+++ b/scripts/t/Dpkg_Shlibs.t
@@ -63,8 +63,8 @@ chdir($cwd);
@librarypaths = Dpkg::Shlibs::get_library_paths();
is_deeply(\@librarypaths,
- [ qw(/nonexistant32 /nonexistant/lib64
- /usr/local/lib /nonexistant/lib128) ], 'parsed library paths');
+ [ qw(/nonexistent32 /nonexistent/lib64
+ /usr/local/lib /nonexistent/lib128) ], 'parsed library paths');
use_ok('Dpkg::Shlibs::Objdump');
@@ -499,7 +499,7 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new(symbol => 'symbol11_optional@Base',
symbol_templ => 'symbol11_optional@Base',
minver => '1.1', dep_id => 1, deprecated => 0,
tags => { optional => undef }, tagorder => [ 'optional' ]),
- 'reappered optional symbol gets undeprecated + minver');
+ 'reappeared optional symbol gets undeprecated + minver');
is( scalar($sym_file->get_lost_symbols($sym_file_dup) +
$sym_file->get_new_symbols($sym_file_dup)), 0, 'reappeared optional symbol: neither NEW nor LOST');
diff --git a/scripts/t/Dpkg_Shlibs/ld.so.conf b/scripts/t/Dpkg_Shlibs/ld.so.conf
index 7f0a4aafe..cb7a19cc2 100644
--- a/scripts/t/Dpkg_Shlibs/ld.so.conf
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf
@@ -1,9 +1,9 @@
# Comment and empty line
# Paths
-/nonexistant32
-/nonexistant/lib64
+/nonexistent32
+/nonexistent/lib64
-include /nonexistant/*.conf
+include /nonexistent/*.conf
include t/Dpkg_Shlibs/ld.so.conf.d/*.conf
diff --git a/scripts/t/Dpkg_Shlibs/ld.so.conf_2 b/scripts/t/Dpkg_Shlibs/ld.so.conf_2
index 4a36fea14..8afcaa57d 100644
--- a/scripts/t/Dpkg_Shlibs/ld.so.conf_2
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf_2
@@ -1 +1 @@
-/nonexistant/lib128
+/nonexistent/lib128
diff --git a/scripts/t/dpkg_buildpackage.t b/scripts/t/dpkg_buildpackage.t
index faae2cba4..2b4345539 100644
--- a/scripts/t/dpkg_buildpackage.t
+++ b/scripts/t/dpkg_buildpackage.t
@@ -38,7 +38,7 @@ my $tmpdir = 't.tmp/dpkg_buildpackage';
$ENV{$_} = rel2abs($ENV{$_}) foreach qw(DPKG_DATADIR DPKG_ORIGINS_DIR);
-# Any paralellization from the parent should be ignored, we are testing
+# Any parallelization from the parent should be ignored, we are testing
# the makefiles serially anyway.
delete $ENV{MAKEFLAGS};
diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index 01ce0fa37..95ccedf82 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -31,7 +31,7 @@ my $datadir = "$srcdir/t/mk";
# directory with «make -C».
$ENV{$_} = rel2abs($ENV{$_}) foreach qw(srcdir DPKG_DATADIR DPKG_ORIGINS_DIR);
-# Any paralellization from the parent should be ignored, we are testing
+# Any parallelization from the parent should be ignored, we are testing
# the makefiles serially anyway.
delete $ENV{MAKEFLAGS};