Sfoglia il codice sorgente

doc, scripts: Fix typos in comments

Guillem Jover 11 anni fa
parent
commit
ae3faa43f7

+ 1 - 1
ChangeLog.old

@@ -4605,7 +4605,7 @@
 	tree even if that package doesn't contain an shlibs file. Then
 	tree even if that package doesn't contain an shlibs file. Then
 	don't complain about missing dependency information if the lib is in
 	don't complain about missing dependency information if the lib is in
 	the same package than the binary. Also ignore it if the library is
 	the same package than the binary. Also ignore it if the library is
-	not versionned and can't have an shlibs file.
+	not versioned and can't have an shlibs file.
 	* scripts/Dpkg/Path.pm (guess_pkg_root_dir)
 	* scripts/Dpkg/Path.pm (guess_pkg_root_dir)
 	(check_files_are_the_same): New helper functions.
 	(check_files_are_the_same): New helper functions.
 
 

+ 1 - 0
debian/changelog

@@ -3,6 +3,7 @@ dpkg (1.17.17) UNRELEASED; urgency=low
   [ Guillem Jover ]
   [ Guillem Jover ]
   * Add dpkg-vendor, Dpkg/File.pm and Dpkg/Util.pm to the list of files with
   * Add dpkg-vendor, Dpkg/File.pm and Dpkg/Util.pm to the list of files with
     translatable strings, so that they can be translated.
     translatable strings, so that they can be translated.
+  * Fix some typos for versioned and mentioned in comments and changelogs.
 
 
   [ Updated programs translations ]
   [ Updated programs translations ]
   * German (Sven Joachim).
   * German (Sven Joachim).

+ 5 - 5
scripts/dpkg-shlibdeps.pl

@@ -481,22 +481,22 @@ sub filter_deps {
 	return 0 if $dep =~ /^\s*\Q$exc\E\b/;
 	return 0 if $dep =~ /^\s*\Q$exc\E\b/;
     }
     }
     # Don't include dependencies if they are already
     # 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})) {
     if (not exists($depseen{$dep})) {
 	$depseen{$dep} = $dependencies{$field}{$dep};
 	$depseen{$dep} = $dependencies{$field}{$dep};
 	return 1;
 	return 1;
     } else {
     } 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
 	# verify if the dependency is stronger than the
 	# previously seen one
 	# previously seen one
 	my $stronger;
 	my $stronger;
 	if ($depseen{$dep} eq $dependencies{$field}{$dep}) {
 	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;
 	    $stronger = 0;
 	} elsif ($dependencies{$field}{$dep} eq '') {
 	} elsif ($dependencies{$field}{$dep} eq '') {
-	    $stronger = 0; # If the dep is unversionned
+	    $stronger = 0; # If the dep is unversioned
 	} elsif ($depseen{$dep} eq '') {
 	} 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,
 	} elsif (version_compare_relation($depseen{$dep}, REL_GT,
                                           $dependencies{$field}{$dep})) {
                                           $dependencies{$field}{$dep})) {
 	    # The version of the dep seen is stronger...
 	    # The version of the dep seen is stronger...

+ 1 - 1
scripts/t/merge_changelogs/ch-b

@@ -18,7 +18,7 @@ test (1.2-2) unstable; urgency=low
 test (1.2-1) unstable; urgency=low
 test (1.2-1) unstable; urgency=low
 
 
   * This entry should not have conflicts with Algorithm::Merge installed.
   * 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.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
   * Pi is 3.14 is true for all changelogs.
   * Changelog A should have a supplementary line
   * Changelog A should have a supplementary line

+ 1 - 1
scripts/t/merge_changelogs/ch-merged

@@ -31,7 +31,7 @@ test (1.2-2) unstable; urgency=low
 test (1.2-1) unstable; urgency=low
 test (1.2-1) unstable; urgency=low
 
 
   * This entry should not have conflicts with Algorithm::Merge installed.
   * 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.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
   * Pi is 3.14 is true for all changelogs.
   * Changelog A should have a supplementary line
   * Changelog A should have a supplementary line

+ 1 - 1
scripts/t/merge_changelogs/ch-merged-basic

@@ -45,7 +45,7 @@ test (1.2-1) unstable; urgency=low
     in the resulting changelog).
     in the resulting changelog).
 =======
 =======
   * This entry should not have conflicts with Algorithm::Merge installed.
   * 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.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
   * Pi is 3.14 is true for all changelogs.
   * Changelog A should have a supplementary line
   * Changelog A should have a supplementary line

+ 1 - 1
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
 test (1.2-1) unstable; urgency=low
 
 
   * This entry should not have conflicts with Algorithm::Merge installed.
   * 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.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
   * Pi is 3.14 is true for all changelogs.
   * Changelog A should have a supplementary line
   * Changelog A should have a supplementary line

+ 1 - 1
scripts/t/merge_changelogs/ch-merged-pr-basic

@@ -47,7 +47,7 @@ test (1.2-1) unstable; urgency=low
     in the resulting changelog).
     in the resulting changelog).
 =======
 =======
   * This entry should not have conflicts with Algorithm::Merge installed.
   * 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.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
   * Pi is 3.14 is true for all changelogs.
   * Changelog A should have a supplementary line
   * Changelog A should have a supplementary line