Author: djpig
Date: 2006-05-12 03:03:18 +0000 (Fri, 12 May 2006)
New Revision: 303
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/changelog/debian.pl
Log:
Allow '+' and '.' in distribution names in Debian changelogs.
Based on a patch by John Wright.
Closes: #361171
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-12 02:58:57 UTC (rev 302)
+++ trunk/ChangeLog 2006-05-12 03:03:18 UTC (rev 303)
@@ -1,3 +1,12 @@
+2006-05-10 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * scripts/changelog/debian.pl: Use same regex for
+ distribution names as for packages. Since the policy
+ doesn't define these names very strict, we should give
+ the user more freedom here though all official names
+ are matched by a way stricter regex. (Characters now
+ allowed are '+' and '.').
+
2006-05-04 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Bump version to 1.13.20~.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-12 02:58:57 UTC (rev 302)
+++ trunk/debian/changelog 2006-05-12 03:03:18 UTC (rev 303)
@@ -4,6 +4,9 @@
* Add remarks to dpkg-scansources and dpkg-scanpackages
man pages about the need to compress the generated files
to be able to access them via apt. Closes: #65839
+ * Allow '+' and '.' in distribution names in Debian changelogs.
+ Based on a patch by John Wright.
+ Closes: #361171
[ Updated dpkg Translations ]
* Portuguese (Miguel Figueiredo).
Modified: trunk/scripts/changelog/debian.pl
===================================================================
--- trunk/scripts/changelog/debian.pl 2006-05-12 02:58:57 UTC (rev 302)
+++ trunk/scripts/changelog/debian.pl 2006-05-12 03:03:18 UTC (rev 303)
@@ -52,7 +52,7 @@
while (<STDIN>) {
s/\s*\n$//;
# printf(STDERR "%-39.39s %-39.39s\n",$expect,$_);
- if (m/^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-0-9a-z]+)+)\;/i) {
+ if (m/^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-+0-9a-z.]+)+)\;/i) {
if ($expect eq 'first heading') {
$f{'Source'}= $1;
$f{'Version'}= $2;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
