From afd7a7a5572b8d714770e49ffaf5783472ef7c6a Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Sat, 16 May 2009 13:48:49 +0000 Subject: [PATCH] Recognise and ignore Breaks: lines. Closes: #523444 --- debian/changelog | 1 + tools/sort_deps | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0cbed77b..6a786c09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ debian-cd (3.1.2) UNRELEASED; urgency=low [ Steve McIntyre ] * tools/imagesums: Add support for more checksum types. genisoimage will shortly start generating sha256 and sha512 sums too. + * Recognise and ignore Breaks: lines. Closes: #523444 -- Frans Pop Sun, 15 Feb 2009 23:41:25 +0100 diff --git a/tools/sort_deps b/tools/sort_deps index 70d9dd14..1751a439 100755 --- a/tools/sort_deps +++ b/tools/sort_deps @@ -308,14 +308,16 @@ sub read_depends { my $i = shift; # Ref my $lines = shift; # Ref my $pkg = shift; # string - my $types = "(?:Pre)?Depends|Suggests|Recommends|Replaces|Conflicts"; + my $types = "(?:Pre)?Depends|Suggests|Recommends|Replaces|Conflicts|Breaks"; my (@dep, @rec, @sug); my ($type, $or, $elt); while ($lines->[$$i] =~ m/^\s([\s\|])($types):/) { $type = $2; $or = $1; # Get rid of replaces and conflicts ... - if (($type eq "Replaces") or ($type eq "Conflicts")) { + if (($type eq "Replaces") or + ($type eq "Conflicts") or + ($type eq "Breaks")) { $$i++; while ($lines->[$$i] =~ m/^\s{4}/) { $$i++;