Fix errors with dependency fields that reference ${dpkg:Version}.

diff --git a/ChangeLog b/ChangeLog
index 20feaefa593a1e31a34ea62400b925763c05468d..6cb241d0691978ea762415829dca08d07ed359d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 27 13:01:12 CST 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-gencontrol.pl: Fix errors with dependency fields that
+    reference ${dpkg:Version}.
+
 Mon Oct 27 18:45:19 CET 2003 Jordi Mallach <jordi@debian.org>
 
   * po/ca.po: Update Catalan translation and recode to UTF-8.

diff --git a/debian/changelog b/debian/changelog
index b65e494196f83bfc36d35c81aafb269750a6bae7..dee9e85881a34154900aed726b6ed1fd0d0d8eb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ dpkg (1.10.17) unstable; urgency=medium
     Don't assume /usr/info/dir exists if /usr/info does.  Closes: #165770.
   * Jordi Mallach <jordi@debian.org>:
     Update Catalan translation.
+  * Fix errors with dependency fields that reference ${dpkg:Version}.
+    Closes: #213108.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index b455a0e008cf0cd08da5669a518959979df327d5..da4063f823dc95c563f555b4b5de3d4a9b8eccaa 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -130,7 +130,6 @@ for $_ (keys %fi) {
         if (m/^(Package|Description|Essential|Optional)$/) {
             $f{$_}= $v;
         } elsif (exists($pkg_dep_fields{$_})) {
-            $f{$_}= showdep(parsedep(substvars($v)), 0);
         } elsif (m/^Section$|^Priority$/) {
             $spvalue{$_}= $v;
         } elsif (m/^Architecture$/) {
@@ -177,6 +176,26 @@ $origversion= $version; $origversion =~ s/-[^-]+$//;
 $substvar{"dpkg:UpstreamVersion"}=$origversion;
 $substvar{"dpkg:Version"}=$version;
 
+for $_ (keys %fi) {
+    $v= $fi{$_};
+    if (s/^C //) {
+    } elsif (s/^C$myindex //) {
+        if (m/^(Package|Description|Essential|Optional)$/) {
+        } elsif (exists($pkg_dep_fields{$_})) {
+            $f{$_}= showdep(parsedep(substvars($v)), 0);
+        } elsif (m/^Section$|^Priority$/) {
+        } elsif (m/^Architecture$/) {
+        } elsif (s/^X[CS]*B[CS]*-//i) {
+        } elsif (!m/^X[CS]+-/i) {
+        }
+    } elsif (m/^C\d+ /) {
+    } elsif (s/^L //) {
+    } elsif (m/o:/) {
+    } else {
+    }
+}
+
+
 for $f (qw(Section Priority)) {
     $spvalue{$f}= $spdefault{$f} unless length($spvalue{$f});
     $f{$f}= $spvalue{$f} if $spinclude{$f} && length($spvalue{$f});