Do not replace substvars for build dependencies

diff --git a/ChangeLog b/ChangeLog
index bc6ce87f87400ed684b0eff6defb67f5b4d97010..0a9e06ac355f6aa6152165f7a90f5bcd72cc68d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-source.pl: Do not replace substvars for build
+       dependencies.
+
 2007-10-08  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-gencontrol.pl: Refer to host architecture (instead of

diff --git a/debian/changelog b/debian/changelog
index 8693795b565d1b420e63a37480d2f3d8f1c8300f..04b468ee6d6767d839e2296839a408087ead45fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
   * Allow comparing unsupported architectures for equality and identity.
     Based on a patch by Frank Lichtenheld. Closes: #427210
   * Document Origin and Bugs fields in deb-control.5. Closes: #173463
+  * Do not replace substvars for build dependencies (it was not supported
+    anyway).
 
   [ Frank Lichtenheld ]
   * Add _MTN to dpkg-source -i default regex. Suggested by Jari Aalto.

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index da22b987ede8dbb7276b2d0d882d76a428fbbfbc..b75f74e8a810a41a1ef8b43ea2a098581461992d 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -289,7 +289,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);
+               my $dep = parsedep($v, 1);
                &error(sprintf(_g("error occurred while parsing %s"), $_)) unless defined $dep;
                $f{$_}= showdep($dep, 1);
            }