From: Frank Lichtenheld <djpig@debian.org>
Date: Sat, 18 Feb 2006 18:19:06 +0000 (+0000)
Subject: Handle architectures in all dependency fields in debian/control,
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2822cd35fa5b1f3f96b77c4c7fcd429bc4aa8a34;p=dpkg

Handle architectures in all dependency fields in debian/control,
even those of binary packages. Closes: #252657, #324741, #347819
---

diff --git a/ChangeLog b/ChangeLog
index 26f9cda9..e116840b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-18  Frank Lichtenheld  <djpig@debian.org>
 
+	* scripts/dpkg-gencontrol.pl: Call parsedep
+	with use_arch and reduce_arch parameters to
+	allow using architectures in dependency
+	fields of binary packages in debian/control.
+
 	* scripts/dpkg-gencontrol.pl: Fix handling of
 	debian/files when architecture is set via -D
 	command line option. The value override was
diff --git a/debian/changelog b/debian/changelog
index 9ff583a5..0058db36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dpkg (1.13.17~) UNRELEASED; urgency=low
 
   [ Frank Lichtenheld ]
   * Fix handling of -DArchitecure=foo in dpkg-gencontrol. Closes: #251911
+  * Handle architectures in all dependency fields in debian/control,
+    even those of binary packages. Closes: #252657, #324741, #347819
 
  -- Frank Lichtenheld <frank@lichtenheld.de>  Sat, 18 Feb 2006 19:01:24 +0100
 
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index b09a8867..36da9a27 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -180,7 +180,7 @@ for $_ (keys %fi) {
     } elsif (s/^C$myindex //) {
         if (m/^(Package|Description|Essential|Optional)$/) {
         } elsif (exists($pkg_dep_fields{$_})) {
-           my $dep = parsedep(substvars($v));
+           my $dep = parsedep(substvars($v), 1, 1);
            &error("error occoured while parsing $_") unless defined $dep;
             $f{$_}= showdep($dep, 0);
         } elsif (m/^Section$|^Priority$/) {