Import Debian changes 3a5-1debian/3a5-1

slib (3a5-1) unstable; urgency=low

  * New upstream release.
  
  * slib.texi (Library Catalogs): Repeat change from 3a3-3.
    
  * Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1.
   
  * guile.init: (library-vicinity): Repeat change from 3a4-2.
  
  * debian/rules (binary-indep): Don't hide .init files in a separate
    subdirectory, thus conforming better to the usual slib practice.  Put a 
    symlink in place to ease transitions.  (Closes: #407370).

1 files changed, 19 insertions, 18 deletions

diff --git a/hash.scm b/hash.scm
index fbee264..c2d8f5c 100644
--- a/hash.scm
+++ b/hash.scm
@@ -17,24 +17,6 @@
 ;promotional, or sales literature without prior written consent in
 ;each case.
 
-(define (hash:hash-symbol sym n)
-  (hash:hash-string (symbol->string sym) n))
-
-;;; This can overflow on implemenatations where inexacts have a larger
-;;; range than exact integers.
-(define hash:hash-number
-  (if (provided? 'inexact)
-      (lambda (num n)
-	(if (integer? num)
-	    (modulo (if (exact? num) num (inexact->exact num)) n)
-	    (hash:hash-string-ci
-	     (number->string (if (exact? num) (exact->inexact num) num))
-	     n)))
-      (lambda (num n)
-	(if (integer? num)
-	    (modulo num n)
-	    (hash:hash-string-ci (number->string num) n)))))
-
 (define (hash:hash-string-ci str n)
   (let ((len (string-length str)))
     (if (> len 5)
@@ -57,6 +39,25 @@
 	      h)))))
 
 (define hash:hash-string hash:hash-string-ci)
+
+(define (hash:hash-symbol sym n)
+  (hash:hash-string (symbol->string sym) n))
+
+;;; This can overflow on implemenatations where inexacts have a larger
+;;; range than exact integers.
+(define hash:hash-number
+  (if (provided? 'inexact)
+      (lambda (num n)
+	(if (integer? num)
+	    (modulo (if (exact? num) num (inexact->exact num)) n)
+	    (hash:hash-string-ci
+	     (number->string (if (exact? num) (exact->inexact num) num))
+	     n)))
+      (lambda (num n)
+	(if (integer? num)
+	    (modulo num n)
+	    (hash:hash-string-ci (number->string num) n)))))
+
 ;@
 (define (hash obj n)
   (let hs ((d 10) (obj obj))