From: Guillem Jover <guillem@debian.org>
Date: Mon, 27 Feb 2006 22:52:50 +0000 (+0000)
Subject: Fix missspelling of "occurred" as "occoured" in dpkg-gencontrol and
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1759efe73bab819c2e9143a286ea99371c982f4;p=dpkg

Fix missspelling of "occurred" as "occoured" in dpkg-gencontrol and
dpkg-source (Matt Kraai). Closes: #353949
---

diff --git a/ChangeLog b/ChangeLog
index 10582d13..2f90e3e2 100644
--- 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 0094ae1b..2321eea2 100644
--- 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 36da9a27..a3750310 100755
--- 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 4a6a44d2..babe7902 100755
--- 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; }