More enhances updates

diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index b206bd3840fe4465c2961af0b447e9d0b775c11c..8de5332b15d8fd1b01a079e8acb36334ca345645 100644 (file)
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -72,6 +72,7 @@ const char
                            N_("conflicts with"),
                            N_("provides"),
                            N_("replaces"),
+                           N_("enhances"),
                            0 },
 
   *const priorityabbrevs[]=  { N_("Req"),

diff --git a/include/dpkg-db.h b/include/dpkg-db.h
index f597dce3b71bce9d787d3c5059b9bb9f95c8e918..909f9a647a8c9d832bd5f59bf89292ef18709691 100644 (file)
--- a/include/dpkg-db.h
+++ b/include/dpkg-db.h
@@ -38,7 +38,8 @@ enum deptype {
   dep_predepends,
   dep_conflicts,
   dep_provides,
-  dep_replaces
+  dep_replaces,
+  deb_enhances
 };
 
 enum depverrel {

diff --git a/main/depcon.c b/main/depcon.c
index 47fe362e5f6500b9f16ef75f63104aec895cbbfa..ffa8586a9c9c0748821b2474be5ffb4d701f88d2 100644 (file)
--- a/main/depcon.c
+++ b/main/depcon.c
@@ -133,6 +133,7 @@ void describedepcon(struct varbuf *addto, struct dependency *dep) {
   case dep_predepends:  varbufaddstr(addto, _(" pre-depends on ")); break;
   case dep_recommends:  varbufaddstr(addto, _(" recommends "));     break;
   case dep_conflicts:   varbufaddstr(addto, _(" conflicts with ")); break;
+  case dep_enhances:    varbufaddstr(addto, _(" enhances "));       break;
   default:              internerr("unknown deptype");
   }
   varbufdependency(addto, dep);
@@ -162,7 +163,8 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
   char linebuf[1024];
 
   assert(dep->type == dep_depends || dep->type == dep_predepends ||
-         dep->type == dep_conflicts || dep->type == dep_recommends);
+         dep->type == dep_conflicts || dep->type == dep_recommends ||
+                dep->type == dep_suggests );
   
   /* The dependency is always OK if we're trying to remove the depend*ing*
    * package.

diff --git a/main/processarc.c b/main/processarc.c
index 600e350aba66a6c16227091c7c14e389b9dcd01c..4b5b71d1a2e2feafb28f389683827fc31598fa48 100644 (file)
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -227,7 +227,11 @@ void process_archive(const char *filename) {
         }
       }
       break;
-    case dep_suggests: case dep_recommends: case dep_depends: case dep_replaces:
+    case dep_suggests:
+    case dep_recommends:
+    case dep_depends:
+    case dep_replaces:
+    case dep_enhances:
       /* Ignore these here. */
       break;
     case dep_predepends: