Apply patch to fix #217943 and, #235266, build conflicts were being pushed

into @unmet instead of @conflicts (probably due to a bad copy & paste).

diff --git a/ChangeLog b/ChangeLog
index 41a18cb678610232eb951027d8d8727caeb37aa6..7fb9f3926ecd5b7690f947e2cdee4f24334387f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 29 21:56:25 GMT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * scripts/dpkg-checkbuilddeps.pl: Push build-conflicts errors into
+  @conflicts instead of @unmet, this looks like an accidental error
+  introduced by bad copy&pasteing.
+
 Mon Mar  8 17:26:06 GMT 2004 Scott James Remnant <scott@netsplit.com>
 
   * debian/changelog, version-nr: Bump to 1.10.19.

diff --git a/debian/changelog b/debian/changelog
index 0b34d660e320a2aa6c9657a101738c47fd604b54..efe9a31a6849f7eb86c226fe625e9b39cdbf7826 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.10.19) unstable; urgency=low
 
-  * 
+  * Distinguish unmet build dependencies from build conflicts.
+    Closes: #217943, #235266.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index cbcef5f55cd5fc8319901e606c78936b63d71703..1e5c3b4a633af99e62b582a7d3d4d4994e80f2df 100755 (executable)
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -44,13 +44,13 @@ if (defined($fi{"C Build-Depends"})) {
        push @unmet, build_depends(parsedep($fi{"C Build-Depends"}, 1, 1), @status);
 }
 if (defined($fi{"C Build-Conflicts"})) {
-       push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status);
+       push @conflicts, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status);
 }
 if (! $binary_only && defined($fi{"C Build-Depends-Indep"})) {
        push @unmet, build_depends(parsedep($fi{"C Build-Depends-Indep"}, 1, 1), @status);
 }
 if (! $binary_only && defined($fi{"C Build-Conflicts-Indep"})) {
-       push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status);
+       push @conflicts, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status);
 }
 
 if (@unmet) {