Remove obsolete priorities support

2 files changed, 5 insertions, 8 deletions

diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index 2d8599568..23faf14ec 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -164,8 +164,11 @@ struct pkginfo { /* pig */
     stat_installed
   } status;
   enum pkgpriority {
-    pri_required, pri_important, pri_standard, pri_recommended,
-    pri_optional, pri_extra, pri_contrib,
+    pri_required,
+    pri_important,
+    pri_standard,
+    pri_optional,
+    pri_extra,
     pri_other, pri_unknown, pri_unset=-1
   } priority;
   const char *otherpriority;
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 55c7ab63c..02ade81c3 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -92,16 +92,10 @@ const struct namevalue priorityinfos[]= {  /* Note !  These must be in order ! *
   { "required",                       pri_required,     8 },
   { "important",                      pri_important,    9 },
   { "standard",                       pri_standard,     8 },
-  /* XXX: obsolete. */
-  { "recommended",                    pri_recommended,  11 },
   { "optional",                       pri_optional,     8 },
   { "extra",                          pri_extra,        5 },
-  /* XXX: keep? */
-  { "contrib",                        pri_contrib,      7 },
   { "this is a bug - please report",  pri_other,        28 },
   { "unknown",                        pri_unknown,      7 },
-  /* XXX: alias, remove. */
-  { "base",                           pri_required,     4 },
   {  NULL                                                 }
 };