From 9e604260ef99dbaf9fd1900e774f0fcc4c3875cd Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Mon, 8 Mar 2004 17:34:14 +0000 Subject: [PATCH] Apply patch to fix #217943 and, #235266, build conflicts were being pushed into @unmet instead of @conflicts (probably due to a bad copy & paste). --- ChangeLog | 6 ++++++ debian/changelog | 3 ++- scripts/dpkg-checkbuilddeps.pl | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41a18cb6..7fb9f392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Feb 29 21:56:25 GMT 2004 Scott James Remnant + + * 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 * debian/changelog, version-nr: Bump to 1.10.19. diff --git a/debian/changelog b/debian/changelog index 0b34d660..efe9a31a 100644 --- 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 UNRELEASED diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl index cbcef5f5..1e5c3b4a 100755 --- 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) { -- 2.39.5