From: Wichert Akkerman <wakkerma@debian.org>
Date: Tue, 7 Dec 1999 00:13:32 +0000 (+0000)
Subject: Comment new suggest/recommend behaviour in dselect - it's broken
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c613f44410d54ba30dfca58da10e6e0d8714802a;p=dpkg

Comment new suggest/recommend behaviour in dselect - it's broken
---

diff --git a/ChangeLog b/ChangeLog
index 417ff6a5..49d5bca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec  7 01:26:21 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Commend changes made in pkgdepcon.cc; they're not completely
+    correct yet
+
 Mon Dec  6 01:37:08 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Correct uid/gid-changes in start-stop-daemon, patch from
diff --git a/debian/emacsen-common-install b/debian/emacsen-common-install
index 6d807743..85674227 100755
--- a/debian/emacsen-common-install
+++ b/debian/emacsen-common-install
@@ -2,7 +2,7 @@
 set -e
 
 FLAVOR=$1
-PACKAGE=dpkg-dev
+PACKAGE=dpkg
 
 ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
 ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
diff --git a/debian/emacsen-common-remove b/debian/emacsen-common-remove
index 0621bad8..2a0b0b2a 100755
--- a/debian/emacsen-common-remove
+++ b/debian/emacsen-common-remove
@@ -2,7 +2,7 @@
 set -e
 
 FLAVOR=$1
-PACKAGE=dpkg-dev
+PACKAGE=dpkg
 
 if [ ${FLAVOR} != emacs ]; then
   echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index aade7491..36503664 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -221,10 +221,13 @@ int packagelist::resolvedepcon(dependency *depends) {
   case dep_provides:
   case dep_replaces:
     return 0;
-    
+
+  case dep_enhances:
+    return 0;
+
   case dep_suggests:
   case dep_recommends:
-
+#if 0
     if (would_like_to_install(depends->up->clientdata->selected,depends->up) <= 0)
       return 0;
 
@@ -260,7 +263,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     r= add(depends, depends->type == dep_suggests ? dp_may : dp_must);
 
     return r;
-
+#endif
   case dep_depends:
   case dep_predepends: