From: Adam Heath <doogie@debian.org>
Date: Mon, 27 Oct 2003 19:04:07 +0000 (+0000)
Subject: Fix errors with dependency fields that reference ${dpkg:Version}.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d2645e6a7c506932a8699f64b3b1d3b5ee260ae;p=dpkg

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

diff --git a/ChangeLog b/ChangeLog
index 20feaefa..6cb241d0 100644
--- 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 b65e4941..dee9e858 100644
--- 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 b455a0e0..da4063f8 100755
--- 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});