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 26f9cda90e8184318f9bc3b6f2ea5a281996a694..e116840beae39af9e6d7f4a843f34b1e296b2812 100644 (file)
--- 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 9ff583a5d140cbb498831f10d278cf9aead54656..0058db36afaea17fab616ad757eb0867152b5dd2 100644 (file)
--- 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 b09a886795c61fdcf78e43439cc5302a510dcfc5..36da9a27dc877926ed5ce7c2380c317c0b6f01be 100755 (executable)
--- 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$/) {