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

diff --git a/ChangeLog b/ChangeLog
index 417ff6a5fd3b5301f34a2dd7659811f7c8c30c8f..49d5bca179ac09abad7492b6bdb09b354ab6d4cf 100644 (file)
--- 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 6d80774304744e2ca271ba7c818e6d0ef838c04e..8567422798b23ebbf64d708a28d64601debf877f 100755 (executable)
--- 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 0621bad82f9e8786d94ec81d9f1e287ed98699d9..2a0b0b2aefcc9618807e3a508bcd0afdfe324c16 100755 (executable)
--- 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 aade749132d9030db4de9a3d4bdcf2f761d8fd1b..365036640f93a8dd1bc9b478d4d2fb4fff3cd809 100644 (file)
--- 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: