Prechádzať zdrojové kódy

Do not replace substvars for build dependencies

Guillem Jover 19 rokov pred
rodič
commit
1136353c27
3 zmenil súbory, kde vykonal 8 pridanie a 1 odobranie
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/dpkg-source.pl

+ 5 - 0
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

+ 2 - 0
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.

+ 1 - 1
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);
 	    }