Fix missspelling of "occurred" as "occoured" in dpkg-gencontrol and

dpkg-source (Matt Kraai). Closes: #353949

diff --git a/ChangeLog b/ChangeLog
index 10582d133dca62726df9b95f2e75a1bb9b87ff0c..2f90e3e2c820bbbf9668a74600498c6bff99722d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Matt Kraai  <kraai@ftbfs.org>
+
+       * scripts/dpkg-gencontrol.pl: Fix typo (occoured -> occurred).
+       * scripts/dpkg-source.pl: Likewise.
+
 2006-02-19  Guillem Jover  <guillem@debian.org>
 
        * po/READNE.translators: Move to ...

diff --git a/debian/changelog b/debian/changelog
index 0094ae1bb6da626bf216ef6819a96064c074e778..2321eea260cf2598a73560b8227bf56a0619d589 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.13.17~) UNRELEASED; urgency=low
   [ Guillem Jover ]
   * Add missing parentheses surrounding a man page section reference
     in the dpkg-source man page (Matt Kraai). Closes: #353731
+  * Fix missspelling of "occurred" as "occoured" in dpkg-gencontrol and
+    dpkg-source (Matt Kraai). Closes: #353949
 
   [ Updated man pages translations ]
   * Polish (Robert Luberda). Closes: #353782

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 36da9a27dc877926ed5ce7c2380c317c0b6f01be..a3750310dd2231538ea4ebe5a3e63d7ae4d7e380 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -181,7 +181,7 @@ for $_ (keys %fi) {
         if (m/^(Package|Description|Essential|Optional)$/) {
         } elsif (exists($pkg_dep_fields{$_})) {
            my $dep = parsedep(substvars($v), 1, 1);
-           &error("error occoured while parsing $_") unless defined $dep;
+           &error("error occurred while parsing $_") unless defined $dep;
             $f{$_}= showdep($dep, 0);
         } elsif (m/^Section$|^Priority$/) {
         } elsif (m/^Architecture$/) {

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 4a6a44d245f16ff4187bf9efffd3d5e3f26a3870..babe7902a1a2b43cdb4040ee9821c58a32f15ba1 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -177,7 +177,7 @@ if ($opmode eq 'build') {
            elsif (m/^Uploaders$/i) { ($f{$_}= $v) =~ s/[\r\n]//g; }
            elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
                my $dep = parsedep(substvars($v),1);
-               &error("error occoured while parsing $_") unless defined $dep;
+               &error("error occurred while parsing $_") unless defined $dep;
                $f{$_}= showdep($dep, 1);
            }
             elsif (s/^X[BC]*S[BC]*-//i) { $f{$_}= $v; }