Make '#' optional in Closes: tags.

diff --git a/ChangeLog b/ChangeLog
index 7940d232335ee8a5579a8dac8c6570d965a9ef19..d2ddd9d96f0e1f8f5082f9893d84477196e83ec5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 23 03:06:19 CST 2000 Adam Heath <doogie@debian.org>
+
+  * scripts/cl-debian.pl: Make '#' optional in Closes: tags.
+
 Sat Dec 23 02:11:27 CST 2000 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-buildpackage.sh: Add -t to -h output.

diff --git a/debian/changelog b/debian/changelog
index 38f34de6ba014840f3fb2fe392dda25b1463a695..394a3dfbb474ccf61084780b7298019a036e8bca 100644 (file)
--- 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 ae31e0eb1d3555ee01e476a48143bbd6a902dec0..67ed0d64c1f5f5a1b077f65178341897dba2a948 100755 (executable)
--- 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);