From 1136353c27a78838935e6632e55063ae87f223e1 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 8 Oct 2007 06:41:03 +0300 Subject: [PATCH] Do not replace substvars for build dependencies --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/dpkg-source.pl | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc6ce87f..0a9e06ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-08 Guillem Jover + + * scripts/dpkg-source.pl: Do not replace substvars for build + dependencies. + 2007-10-08 Guillem Jover * scripts/dpkg-gencontrol.pl: Refer to host architecture (instead of diff --git a/debian/changelog b/debian/changelog index 8693795b..04b468ee 100644 --- 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 da22b987..b75f74e8 100755 --- 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); } -- 2.39.5