Просмотр исходного кода

Allow '+' and '.' in distribution names in Debian changelogs.
Based on a patch by John Wright.
Closes: #361171

Frank Lichtenheld лет назад: 20
Родитель
Сommit
5d4e211856
3 измененных файлов с 13 добавлено и 1 удалено
  1. 9 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 1
      scripts/changelog/debian.pl

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+2006-05-10  Frank Lichtenheld  <djpig@debian.org>
+
+	* 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  <guillem@debian.org>
 
 	* configure.ac: Bump version to 1.13.20~.

+ 3 - 0
debian/changelog

@@ -4,6 +4,9 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
   * 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).

+ 1 - 1
scripts/changelog/debian.pl

@@ -52,7 +52,7 @@ $expect='first heading';
 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;