The following commit has been merged in the master branch:
commit eb9530267699beead11f203d0e962e1bce82b587
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Fri Mar 14 13:50:08 2008 +0100
Dpkg::Changelog::Debian: Allow capitals in distribution/package names
* scripts/Dpkg/Changelog/Debian.pm: Fix regression by re-allowing
capitals (like UNRELEASED!) in the distribution/package name.
* scripts/t/600_Dpkg_Changelog/regressions: Add capitals in the
distribution name as part of the non-regression tests.
diff --git a/ChangeLog b/ChangeLog
index fd73dcb..be588d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-14 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Changelog/Debian.pm: Fix regression by re-allowing
+ capitals (like UNRELEASED!) in the distribution/package name.
+ * scripts/t/600_Dpkg_Changelog/regressions: Add capitals in the
+ distribution name as part of the non-regression tests.
+
2008-03-11 Ian Jackson <[EMAIL PROTECTED]>,
Guillem Jover <[EMAIL PROTECTED]>
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index d7f0c9d..b9a4b03 100644
--- a/scripts/Dpkg/Changelog/Debian.pm
+++ b/scripts/Dpkg/Changelog/Debian.pm
@@ -134,7 +134,7 @@ sub parse {
while (<$fh>) {
s/\s*\n$//;
# printf(STDERR "%-39.39s %-39.39s\n",$expect,$_);
- my $name_chars = qr/[-+0-9a-z.]/;
+ my $name_chars = qr/[-+0-9a-z.]/i;
if (m/^(\w$name_chars*) \(([^\(\) \t]+)\)((\s+$name_chars+)+)\;/i) {
unless ($expect eq 'first heading'
|| $expect eq 'next heading or eof') {
diff --git a/scripts/t/600_Dpkg_Changelog/regressions
b/scripts/t/600_Dpkg_Changelog/regressions
index 356174a..d010180 100644
--- a/scripts/t/600_Dpkg_Changelog/regressions
+++ b/scripts/t/600_Dpkg_Changelog/regressions
@@ -1,4 +1,4 @@
-re-gressions++1.2.3 (1.5-1) allowed.chars-567+890; urgency=low
+re-gressions++1.2.3 (1.5-1) ALLOWED.chars-567+890; urgency=low
* Test allowed chars in package name and distribution name.
(Closes: #361171)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
