Various updates; see ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5ad79a7ae0509025a59340528cb2345999d026ed..9423c4e0871aef3f24a6a142e34c55e23d784022 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 29 21:11:35 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Change default lispdir to $(prefix)/emacs/site-lisp/$PACKAGE
+
+Sun Nov 28 21:56:32 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * dselect/pkgdepcon.cc: don't treat recommends like (pre-)depends.
+    Instead make it similar to suggests but default to selecting the package.
+
 Sat Nov 27 09:46:26 EST 1999 Ben Collins <bcollins@debian.org>
 
   * utils/start-stop-daemon.c: call initgroups() prior to seteuid()

diff --git a/configure.in b/configure.in
index 0ac543c66d1a8c568fa5b0d69e1d1a3598773a8a..b17fb75372b2bc8ca1732ab3f5da927cdd8fc0ac 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,7 @@ AC_CHECK_PROG(RM,rm,rm -f)
 AC_CHECK_PROG(SED,sed,sed)
 AC_PROG_INSTALL
 dnl Default in case EMACS == no
-lispdir="\$(datadir)/emacs/site-lisp/$PACKAGE"
+lispdir="\$(prefix)/emacs/site-lisp/$PACKAGE"
 AM_PATH_LISPDIR
 AC_MODE_T
 AC_PID_T

diff --git a/debian/changelog b/debian/changelog
index 7152a06dc69427dfb745df2bf113f53607b2b762..47f509c062675392612fb3b5df7104a604fef462 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
+dpkg (1.6.2) unstable; urgency=low
+
+  * Fix default lispdir, Closes: #51525
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.6.1) unstable; urgency=low
 
-  * dselect/main.cc: fixed three cases where gettext usage was not
-    possible die to macros inlined in the strings
-  * utils/start-stop-daemon.c: call initgroups() prior to seteuid()
+  * Fix some slight packaging errors
 
- -- Wichert Akkerman <bcollins@debian.org>  UNRELEASED
+ -- Wichert Akkerman <wakkerma@debian.org>  Fri, 26 Nov 1999 20:18:48 +0100
 
 dpkg (1.6) unstable; urgency=low
 

diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 7603980de2835f2038eadecf8063faaf5d3a4056..aade749132d9030db4de9a3d4bdcf2f761d8fd1b 100644 (file)
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -223,9 +223,44 @@ int packagelist::resolvedepcon(dependency *depends) {
     return 0;
     
   case dep_suggests:
-    if (0) return 0; /* fixme: configurable */
-    // fall through ...
   case dep_recommends:
+
+    if (would_like_to_install(depends->up->clientdata->selected,depends->up) <= 0)
+      return 0;
+
+    fixbyupgrade= 0;
+    
+    for (possi= depends->list;
+         possi && !deppossatisfied(possi,&fixbyupgrade);
+         possi= possi->next);
+    if (depdebug && debug)
+      fprintf(debug,"packagelist[%p]::resolvedepcon([%p]): depends found %s\n",
+              this,depends,
+              possi ? possi->ed->name : _("[none]"));
+    if (possi) return 0;
+
+    // For a recommends we default to selecting the package
+    if (depends->type==dep_recommends)  {
+      for (possi=depends->list; possi; possi= possi->next) {
+        pkginfo::pkgwant nw;
+       if (!possi->ed->clientdata) continue;
+       nw= reallywant(pkginfo::want_install, possi->ed->clientdata);
+       if (possi->ed->clientdata->selected == nw ||
+               (possi->ed->clientdata->selected == pkginfo::want_purge &&
+                nw==pkginfo::want_deinstall))
+           ; // already in the state we want it, so do nothing
+       else {
+         possi->ed->clientdata->suggested = possi->ed->clientdata->selected = nw;
+         possi->ed->clientdata->spriority= sp_selecting;
+       }
+      }
+    }
+    
+    // Ensures all in the recursive list; adds info strings; ups priorities
+    r= add(depends, depends->type == dep_suggests ? dp_may : dp_must);
+
+    return r;
+
   case dep_depends:
   case dep_predepends: