Let dpkg-source -b check the build relation fields before

putting them into the .dsc. As a side effect they also
get normalized. Closes: #254449

diff --git a/ChangeLog b/ChangeLog
index 8d38748c5a5314db0af90eb81116c396db72895d..3b200de1619407ebe8c77985b5a3ea52c0617c5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-04  Frank Lichtenheld  <djpig@debian.org>
+ 
+       * scripts/dpkg-source.pl: Check build relation
+       fields for correctness before putting them into
+       the .dsc when building. This also normalizes the
+       fields.
+ 
 2005-10-03  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/dpkg-source.pl: Try to chown files extracted from

diff --git a/debian/changelog b/debian/changelog
index 0606807d9b83e490ff27b4c90c09d3ed8963e469..c0ef7725b3e861d91507218fe6c6a5db2cd36a8e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ dpkg (1.13.12~) unstable; urgency=low
     0700, too. Together this should make it safer to run
     dpkg-source -x as root. Based on suggestions by Marcus
     Brinkmann and Colin Watson. Closes: #144571, #238460
+  * Let dpkg-source -b check the build relation fields before
+    putting them into the .dsc. As a side effect they also
+    get normalized. Closes: #254449
 
  --
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6798b21554743d39a69187d747ee6ad817d2a07e..6256b3b2039f5ecb2be9f5e5c630f524e95e4f54 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -170,7 +170,11 @@ if ($opmode eq 'build') {
         if (s/^C //) {
             if (m/^Source$/i) { &setsourcepackage; }
             elsif (m/^(Standards-Version|Origin|Maintainer|Uploaders)$/i) { $f{$_}= $v; }
-           elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) { $f{$_}= $v; }
+           elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
+               my $dep = parsedep(substvars($v),1);
+               &error("error occoured while parsing $_") unless defined $dep;
+               $f{$_}= showdep($dep, 1);
+           }
             elsif (s/^X[BC]*S[BC]*-//i) { $f{$_}= $v; }
             elsif (m/^(Section|Priority|Files|Bugs)$/i || m/^X[BC]+-/i) { }
             else { &unknown('general section of control info file'); }