summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2014-10-10 16:50:36 +0200
committerGuillem Jover <guillem@debian.org>2014-10-12 04:50:20 +0200
commitae3faa43f7f425e8c4ce72bc3beef3c9e8703ae4 (patch)
tree28ea550c414e47686a0cdf539a9137a448431252 /scripts
parent57dfc48c6cf40c0982eaabfc7a3c02b94f139221 (diff)
downloaddpkg-ae3faa43f7f425e8c4ce72bc3beef3c9e8703ae4.tar.gz
doc, scripts: Fix typos in comments
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/dpkg-shlibdeps.pl10
-rw-r--r--scripts/t/merge_changelogs/ch-b2
-rw-r--r--scripts/t/merge_changelogs/ch-merged2
-rw-r--r--scripts/t/merge_changelogs/ch-merged-basic2
-rw-r--r--scripts/t/merge_changelogs/ch-merged-pr2
-rw-r--r--scripts/t/merge_changelogs/ch-merged-pr-basic2
6 files changed, 10 insertions, 10 deletions
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index bda1e0962..0a36e9bcc 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -481,22 +481,22 @@ sub filter_deps {
return 0 if $dep =~ /^\s*\Q$exc\E\b/;
}
# Don't include dependencies if they are already
- # mentionned in a higher priority field
+ # mentioned in a higher priority field
if (not exists($depseen{$dep})) {
$depseen{$dep} = $dependencies{$field}{$dep};
return 1;
} else {
- # Since dependencies can be versionned, we have to
+ # Since dependencies can be versioned, we have to
# verify if the dependency is stronger than the
# previously seen one
my $stronger;
if ($depseen{$dep} eq $dependencies{$field}{$dep}) {
- # If both versions are the same (possibly unversionned)
+ # If both versions are the same (possibly unversioned)
$stronger = 0;
} elsif ($dependencies{$field}{$dep} eq '') {
- $stronger = 0; # If the dep is unversionned
+ $stronger = 0; # If the dep is unversioned
} elsif ($depseen{$dep} eq '') {
- $stronger = 1; # If the dep seen is unversionned
+ $stronger = 1; # If the dep seen is unversioned
} elsif (version_compare_relation($depseen{$dep}, REL_GT,
$dependencies{$field}{$dep})) {
# The version of the dep seen is stronger...
diff --git a/scripts/t/merge_changelogs/ch-b b/scripts/t/merge_changelogs/ch-b
index 6ea017852..9eb78699b 100644
--- a/scripts/t/merge_changelogs/ch-b
+++ b/scripts/t/merge_changelogs/ch-b
@@ -18,7 +18,7 @@ test (1.2-2) unstable; urgency=low
test (1.2-1) unstable; urgency=low
* This entry should not have conflicts with Algorithm::Merge installed.
- * I'm the added line mentionned below (B-only).
+ * I'm the added line mentioned below (B-only).
* Changelog B should a have supplementary line above this one.
* Pi is 3.14 is true for all changelogs.
* Changelog A should have a supplementary line
diff --git a/scripts/t/merge_changelogs/ch-merged b/scripts/t/merge_changelogs/ch-merged
index e2411ab36..c995f1cf9 100644
--- a/scripts/t/merge_changelogs/ch-merged
+++ b/scripts/t/merge_changelogs/ch-merged
@@ -31,7 +31,7 @@ test (1.2-2) unstable; urgency=low
test (1.2-1) unstable; urgency=low
* This entry should not have conflicts with Algorithm::Merge installed.
- * I'm the added line mentionned below (B-only).
+ * I'm the added line mentioned below (B-only).
* Changelog B should a have supplementary line above this one.
* Pi is 3.14 is true for all changelogs.
* Changelog A should have a supplementary line
diff --git a/scripts/t/merge_changelogs/ch-merged-basic b/scripts/t/merge_changelogs/ch-merged-basic
index ee5d84352..6b054c353 100644
--- a/scripts/t/merge_changelogs/ch-merged-basic
+++ b/scripts/t/merge_changelogs/ch-merged-basic
@@ -45,7 +45,7 @@ test (1.2-1) unstable; urgency=low
in the resulting changelog).
=======
* This entry should not have conflicts with Algorithm::Merge installed.
- * I'm the added line mentionned below (B-only).
+ * I'm the added line mentioned below (B-only).
* Changelog B should a have supplementary line above this one.
* Pi is 3.14 is true for all changelogs.
* Changelog A should have a supplementary line
diff --git a/scripts/t/merge_changelogs/ch-merged-pr b/scripts/t/merge_changelogs/ch-merged-pr
index 862d97785..467211c80 100644
--- a/scripts/t/merge_changelogs/ch-merged-pr
+++ b/scripts/t/merge_changelogs/ch-merged-pr
@@ -24,7 +24,7 @@ test (1.2-2) unstable; urgency=low
test (1.2-1) unstable; urgency=low
* This entry should not have conflicts with Algorithm::Merge installed.
- * I'm the added line mentionned below (B-only).
+ * I'm the added line mentioned below (B-only).
* Changelog B should a have supplementary line above this one.
* Pi is 3.14 is true for all changelogs.
* Changelog A should have a supplementary line
diff --git a/scripts/t/merge_changelogs/ch-merged-pr-basic b/scripts/t/merge_changelogs/ch-merged-pr-basic
index 6b85fa694..61f46cd69 100644
--- a/scripts/t/merge_changelogs/ch-merged-pr-basic
+++ b/scripts/t/merge_changelogs/ch-merged-pr-basic
@@ -47,7 +47,7 @@ test (1.2-1) unstable; urgency=low
in the resulting changelog).
=======
* This entry should not have conflicts with Algorithm::Merge installed.
- * I'm the added line mentionned below (B-only).
+ * I'm the added line mentioned below (B-only).
* Changelog B should a have supplementary line above this one.
* Pi is 3.14 is true for all changelogs.
* Changelog A should have a supplementary line