libdpkg: Move nicknames table from parsehelp.c to parse.c

This table is only ever going to be used at parse time when normalizing
the input.

lib/dpkg/parse.c

@@ -79,10 +79,20 @@ const struct fieldinfo fieldinfos[]= {
   { "Description",      f_charfield,       w_charfield,      PKGIFPOFF(description)   },
   { "Triggers-Pending", f_trigpend,        w_trigpend                                 },
   { "Triggers-Awaited", f_trigaw,          w_trigaw                                   },
-  /* Note that aliases are added to the nicknames table in parsehelp.c. */
+  /* Note that aliases are added to the nicknames table. */
   {  NULL                                                                             }
 };
 
+static const struct nickname nicknames[] = {
+  /* Note: Capitalization of these strings is important. */
+  { .nick = "Recommended",      .canon = "Recommends" },
+  { .nick = "Optional",         .canon = "Suggests" },
+  { .nick = "Class",            .canon = "Priority" },
+  { .nick = "Package-Revision", .canon = "Revision" },
+  { .nick = "Package_Revision", .canon = "Revision" },
+  { .nick = NULL }
+};
+
 struct field_state {
   const char *fieldstart;
   const char *valuestart;

lib/dpkg/parsedump.h

@@ -87,6 +87,5 @@ struct nickname {
 };
 
 extern const struct fieldinfo fieldinfos[];
-extern const struct nickname nicknames[];
 
 #endif /* LIBDPKG_PARSEDUMP_H */

lib/dpkg/parsehelp.c

@@ -140,16 +140,6 @@ pkg_name_is_illegal(const char *p, const char **ep)
   return buf;
 }
 
-const struct nickname nicknames[]= {
-  /* Note: Capitalization of these strings is important. */
-  { .nick = "Recommended",      .canon = "Recommends" },
-  { .nick = "Optional",         .canon = "Suggests" },
-  { .nick = "Class",            .canon = "Priority" },
-  { .nick = "Package-Revision", .canon = "Revision" },
-  { .nick = "Package_Revision", .canon = "Revision" },
-  { .nick = NULL }
-};
-
 bool
 informativeversion(const struct versionrevision *version)
 {