From 2b71c8d006ccaa74bdf01abc4f52670b0fbdaf92 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Sat, 23 Dec 2000 09:09:07 +0000 Subject: [PATCH] Make '#' optional in Closes: tags. --- ChangeLog | 4 ++++ debian/changelog | 1 + scripts/cl-debian.pl | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7940d232..d2ddd9d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 23 03:06:19 CST 2000 Adam Heath + + * scripts/cl-debian.pl: Make '#' optional in Closes: tags. + Sat Dec 23 02:11:27 CST 2000 Adam Heath * scripts/dpkg-buildpackage.sh: Add -t to -h output. diff --git a/debian/changelog b/debian/changelog index 38f34de6..394a3dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ dpkg (1.8.0) unstable; urgency=low + * Make '#' optional in Closes: tags. Closes: Bug#63137. * Add -t to -h output in dpkg-buildpackage: Closes: Bug#49598. * Fix typo in --compare-versions error message. Closes: Bug#66474. * -R doesn't mean --root. Closes: Bug#66068, #72013 diff --git a/scripts/cl-debian.pl b/scripts/cl-debian.pl index ae31e0eb..67ed0d64 100755 --- a/scripts/cl-debian.pl +++ b/scripts/cl-debian.pl @@ -138,7 +138,7 @@ $expect eq 'next heading or eof' || die "found eof where expected $expect"; $f{'Changes'} =~ s/\n$//; $f{'Changes'} =~ s/^/\n/; -while ($f{'Changes'} =~ /closes:\s*(?:bug)?\#\s?\d+(?:,\s*(?:bug)?\#\s?\d+)*/ig) { +while ($f{'Changes'} =~ /closes:\s*(?:bug)?\#?\s?\d+(?:,\s*(?:bug)?\#?\s?\d+)*/ig) { push(@closes, $& =~ /\#\s?(\d+)/g); } $f{'Closes'} = join(' ',sort { $a <=> $b} @closes); -- 2.39.5