Remove restriction that package names be at least two characters long.

diff --git a/ChangeLog b/ChangeLog
index b6c0337971013e77c6d50be90d7b490740acbc28..d05193bec3a2d27625e736c9afa4e6a2a3b57809 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 7 00:04:28 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * lib/parsehelp.c, scripts/dpkg-source.pl, scripts/cl-debian.pl: Remove
+  restriction that package names be at least two characters long.
+
 Thu May 6 23:57:52 BST 2004 Andrew Shugg <andrew@neep.com.au>
 
   * utils/md5sum.c: Add support for DOS line-endings (\r\n).

diff --git a/debian/changelog b/debian/changelog
index c5f5179c31c070d3d4e71bf58cc1e4389d9b9bf9..a5d508c17bc9aa2fe58f565e8384d02a41f7d97d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.10.22) unstable; urgency=low
   * Fix segfault when "gcc -dumpmachine" returns a non-matching triplet.
     Closes: #211850.
   * Add support for DOS line-endings to md5sum.  Closes: #246103.
+  * Remove restriction that package names be at least two characters long.
+    Closes: #237734.
   * Correct 'n' and 'p' key descriptions in dselect help message.
     Closes: #120562.
   * Stop hardcoding the list of manual page languages in debian/rules,

diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 9478445b8db5397774a4fb16280e8234ed380cd8..dbdff0fbe1592f948dc0001397a1750565adb313 100644 (file)
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -112,7 +112,6 @@ const char *illegal_packagename(const char *p, const char **ep) {
   
   if (!*p) return _("may not be empty string");
   if (!isalnum(*p)) return _("must start with an alphanumeric");
-  if (!*++p) return _("must be at least two characters");
   while ((c= *p++)!=0)
     if (!isalnum(c) && !strchr(alsoallowed,c)) break;
   if (!c) return NULL;

diff --git a/scripts/cl-debian.pl b/scripts/cl-debian.pl
index e6a4d162a7b602e7401ca2d7989f627c5c65e4f9..b3db0033c31bd63a62d5154c46d74d78b5397962 100755 (executable)
--- a/scripts/cl-debian.pl
+++ b/scripts/cl-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;

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 70a6281dcff3a56f28bb0b3c2739ab620cddabb9..5efc2c603a2b8ed34d4f9bf120103ea05dc2b03e 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -530,8 +530,8 @@ if ($opmode eq 'build') {
     $sourcepackage= $fi{'S Source'};
     $sourcepackage =~ m/[^-+.0-9a-z]/ &&
         &error("source package name contains illegal character \`$&'");
-    $sourcepackage =~ m/^[0-9a-z]./ ||
-        &error("source package name is too short or starts with non-alphanum");
+    $sourcepackage =~ m/^[0-9a-z]/ ||
+        &error("source package name starts with non-alphanum");
 
     $version= $fi{'S Version'};
     $version =~ m/[^-+:.0-9a-zA-Z~]/ &&