Import Debian changes 5d9-4.1debian/5d9-4.1

scm (5d9-4.1) unstable; urgency=high

  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix.
  * Revert upstream "CAUTIOUS" define, which causes the scm build to
    fail its test suite on alpha (and, it appears, powerpc as well).
    Closes: #245810.

scm (5d9-4) unstable; urgency=low

  * Apply patch from 144062 to fix hppa build (Closes: #144062)
  * Change scm.1 section from Jan 4 200 to 1. (lintian)

scm (5d9-3) unstable; urgency=low

  * Properly clean up info files.
  * Make and install Xlibscm.info.

scm (5d9-2) unstable; urgency=low

  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)

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

  * New upstream release
  * Merge NMU sparc changes (Closes: #191171, #191356)
  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
  * Scheme imps now grouped in info file (has been for a while)
  (Closes: #115452)

1 files changed, 22 insertions, 16 deletions

diff --git a/mkimpcat.scm b/mkimpcat.scm
index f94f949..df6c813 100644
--- a/mkimpcat.scm
+++ b/mkimpcat.scm
@@ -44,6 +44,7 @@
 (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)
@@ -82,11 +83,15 @@
 			   (in-implementation-vicinity "ioext" link:able-suffix)
 			   (usr:lib "c"))
 		 (add-alias 'directory-for-each 'i/o-extensions)
+		 (add-alias 'directory 'i/o-extensions)
 		 (add-alias 'line-i/o 'i/o-extensions)
 		 (add-alias 'pipe 'i/o-extensions)))
 	  (cond ((add-link 'rev2-procedures
 			   (in-implementation-vicinity "sc2"
 						       link:able-suffix))))
+	  (cond ((add-link 'byte
+			   (in-implementation-vicinity "byte"
+						       link:able-suffix))))
 	  (cond ((or
 		  (add-link 'db
 			    (in-wb-vicinity "db.so"))
@@ -104,6 +109,8 @@
 			    (usr:lib "c")))
 		 (add-source 'wb-table
 			     (in-wb-vicinity "wbtab"))
+		 (add-source 'rwb-isam
+			     (in-wb-vicinity "rwb-isam"))
 		 (add-alias 'wb 'db)))
 	  (cond ((add-link 'mysql
 			   (in-implementation-vicinity "database"
@@ -182,27 +189,22 @@
 	(add-alias '3rs 'r3rs)
 	(add-alias '4rs 'r4rs)
 	(add-alias '5rs 'r5rs)
-	(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
+	(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
 			     (string-append "disarm" (scheme-file-suffix))))
-	(add-source 'build (in-implementation-vicinity "build"))
-	(add-source 'compile (in-implementation-vicinity
+	(add-source 'build (in-installation-vicinity "build"))
+	(add-source 'compile (in-installation-vicinity
 			      (string-append "compile" (scheme-file-suffix))))
 	(display* ")")
 	)
 
-      (begin
-	;; Messy because this trait has no C-installed feature name
-	(display* "#.(if (defined? renamed-identifier)")
-	(display* "      '(")
-	(display "       " op)
-	(add-source 'macro (in-implementation-vicinity "Macro"))
-	(display* "        )")
-	(display* "      '())")
-	)
+      (display* "#+" 'primitive-hygiene)
+      (display* "(")
+      (add-source 'macro (in-installation-vicinity "Macro"))
+      (display* ")")
 
       (add-links 'dld
 		 (lambda (lib) (string-append "/usr/lib/lib" lib ".a"))
@@ -229,4 +231,8 @@
 		 (lambda (lib) #f)
 		 (lambda (lib) #f)
 		 ".so")
+      (add-links 'win32-dl
+                 (lambda (lib) #f)
+                 (lambda (lib) #f)
+                 ".dll")
       )))