Import Debian changes 5e1-1debian/5e1-1

scm (5e1-1) unstable; urgency=low

  * New upstream release.  (Closes: #335970)
  * debian/rules (SCM_OPTIONS): Remove -F turtlegr; the file supporting
    this option seems to have gone by the wayside.
  * debian/rules (binary-arch): Don't try to install grtest.scm; it's gone
    now.
    
  * debian/rules (build-stamp): Use tee to capture output of ./build so
    that we can capture a copy of the file in the build log.
    
  * scm.1: Fix spelling errors in manual page:
     verobse -> verbose; 
     qoutes -> quotes;
     aguments -> arguments;
     neccessary -> necessary;
     preceeds -> precedes.
     syncronization -> synchronization.
     (Closes: #300131)
    
  * debian/postinst, debian/prerm: Assume that install-docs is in the
    standard place, and test for it there with test -x.  (Closes: #292996)

1 files changed, 28 insertions, 9 deletions

diff --git a/mkimpcat.scm b/mkimpcat.scm
index df6c813..c745cfc 100644
--- a/mkimpcat.scm
+++ b/mkimpcat.scm
@@ -44,7 +44,6 @@
 (let ((catname "implcat")
       (iv (implementation-vicinity)))
   (define (in-implementation-vicinity . paths) (apply in-vicinity iv paths))
-  (define (in-installation-vicinity . paths) (apply in-vicinity "/usr/lib/scm/" paths))
   (call-with-output-file (in-implementation-vicinity catname)
     (lambda (op)
       (define (display* . args)
@@ -94,6 +93,20 @@
 						       link:able-suffix))))
 	  (cond ((or
 		  (add-link 'db
+			    (in-implementation-vicinity "db.so"))
+		  (add-link 'db
+			    (in-implementation-vicinity "db" link:able-suffix)
+			    (in-implementation-vicinity "handle" link:able-suffix)
+			    (in-implementation-vicinity "blink" link:able-suffix)
+			    (in-implementation-vicinity "prev" link:able-suffix)
+			    (in-implementation-vicinity "ent" link:able-suffix)
+			    (in-implementation-vicinity "sys" link:able-suffix)
+			    (in-implementation-vicinity "del" link:able-suffix)
+			    (in-implementation-vicinity "stats" link:able-suffix)
+			    (in-implementation-vicinity "blkio" link:able-suffix)
+			    (in-implementation-vicinity "scan" link:able-suffix)
+			    (usr:lib "c"))
+		  (add-link 'db
 			    (in-wb-vicinity "db.so"))
 		  (add-link 'db
 			    (in-wb-vicinity "db" link:able-suffix)
@@ -108,8 +121,12 @@
 			    (in-wb-vicinity "scan" link:able-suffix)
 			    (usr:lib "c")))
 		 (add-source 'wb-table
+			     (in-implementation-vicinity "wbtab"))
+		 (add-source 'wb-table
 			     (in-wb-vicinity "wbtab"))
 		 (add-source 'rwb-isam
+			     (in-implementation-vicinity "rwb-isam"))
+		 (add-source 'rwb-isam
 			     (in-wb-vicinity "rwb-isam"))
 		 (add-alias 'wb 'db)))
 	  (cond ((add-link 'mysql
@@ -160,6 +177,8 @@
 	  (add-link 'socket
 		    (in-implementation-vicinity "socket" link:able-suffix)
 		    (usr:lib "c"))
+	  (add-link 'diff
+		    (in-implementation-vicinity "differ" link:able-suffix))
 	  (add-link 'record
 		    (in-implementation-vicinity "record" link:able-suffix))
 	  (add-link 'generalized-c-arguments
@@ -189,21 +208,21 @@
 	(add-alias '3rs 'r3rs)
 	(add-alias '4rs 'r4rs)
 	(add-alias '5rs 'r5rs)
-	(add-alias 'hobbit (in-installation-vicinity "hobbit"))
-	(add-alias 'scmhob (in-installation-vicinity "scmhob"))
-	(add-alias 'regex-case (in-installation-vicinity "rgxcase"))
-	(add-alias 'url-filename (in-installation-vicinity "urlfile"))
-	(add-source 'disarm (in-installation-vicinity
+	(add-alias 'hobbit (in-implementation-vicinity "hobbit"))
+	(add-alias 'scmhob (in-implementation-vicinity "scmhob"))
+	(add-alias 'regex-case (in-implementation-vicinity "rgxcase"))
+	(add-alias 'url-filename (in-implementation-vicinity "urlfile"))
+	(add-source 'disarm (in-implementation-vicinity
 			     (string-append "disarm" (scheme-file-suffix))))
-	(add-source 'build (in-installation-vicinity "build"))
-	(add-source 'compile (in-installation-vicinity
+	(add-source 'build (in-implementation-vicinity "build"))
+	(add-source 'compile (in-implementation-vicinity
 			      (string-append "compile" (scheme-file-suffix))))
 	(display* ")")
 	)
 
       (display* "#+" 'primitive-hygiene)
       (display* "(")
-      (add-source 'macro (in-installation-vicinity "Macro"))
+      (add-source 'macro (in-implementation-vicinity "Macro"))
       (display* ")")
 
       (add-links 'dld