Import Debian changes 3a1-4.2debian/3a1-4.2

slib (3a1-4.2) unstable; urgency=low

  * Non-maintainer upload.
  * Add guile.init.local for use within the build dir, since otherwise we
    have an (earlier unnoticed) circular build-dep due to a difference
    between scm and guile.

slib (3a1-4.1) unstable; urgency=low

  * Non-maintainer upload.
  * Build-depend on guile-1.6 instead of scm, since the new version of
    scm is wedged in unstable (closes: #281809).

slib (3a1-4) unstable; urgency=low

  * Also check for expected creation on slibcat. (Closes: #240096)

slib (3a1-3) unstable; urgency=low

  * Also check for /usr/share/guile/1.6/slib before installing for guile
    1.6. (Closes: #239267)

slib (3a1-2) unstable; urgency=low

  * Add format.scm back into slib until gnucash stops using it.
  * Call guile-1.6 new-catalog (Closes: #238231)

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

  * New upstream release
  * Remove Info section from doc-base file (Closes: #186950)
  * Remove period from end of description (linda, lintian)
  * html gen fixed upstream (Closes: #111778)

slib (2d4-2) unstable; urgency=low

  * Fix url for upstream source (Closes: #144981)
  * Fix typo in slib.texi (enquque->enqueue) (Closes: #147475)
  * Add build depends.

slib (2d4-1) unstable; urgency=low

  * New upstream.

slib (2d3-1) unstable; urgency=low

  * New upstream.
  * Remove texi2html call in debian/rules.  Now done upstream.  Add make
    html instead.
  * Changes to rules and doc-base to conform to upstream html gen
  * Clean up upstream makefile to make sure it cleans up after itself.

1 files changed, 13 insertions, 13 deletions

diff --git a/withfile.scm b/withfile.scm
index 43e9300..f9e7226 100644
--- a/withfile.scm
+++ b/withfile.scm
@@ -8,7 +8,7 @@
 ;1.  Any copy made of this software must include this copyright notice
 ;in full.
 ;
-;2.  I have made no warrantee or representation that the operation of
+;2.  I have made no warranty or representation that the operation of
 ;this software will be error-free, and I am under no obligation to
 ;provide any services, by way of maintenance, update, or otherwise.
 ;
@@ -21,10 +21,10 @@
 
 (define withfile:current-input (current-input-port))
 (define withfile:current-output (current-output-port))
-
+;@
 (define (current-input-port) withfile:current-input)
 (define (current-output-port) withfile:current-output)
-
+;@
 (define (with-input-from-file file thunk)
   (define oport withfile:current-input)
   (define port (open-input-file file))
@@ -32,50 +32,50 @@
 			   (set! withfile:current-input port))
 		(lambda() (let ((ans (thunk))) (close-input-port port) ans))
 		(lambda() (set! withfile:current-input oport))))
-
-(define (with-output-from-file file thunk)
+;@
+(define (with-output-to-file file thunk)
   (define oport withfile:current-output)
   (define port (open-output-file file))
   (dynamic-wind (lambda() (set! oport withfile:current-output)
 		          (set! withfile:current-output port))
 		(lambda() (let ((ans (thunk))) (close-output-port port) ans))
 		(lambda() (set! withfile:current-output oport))))
-
+;@
 (define peek-char
   (let ((peek-char peek-char))
     (lambda opt
       (peek-char (if (null? opt) withfile:current-input (car opt))))))
-
+;@
 (define read-char
   (let ((read-char read-char))
     (lambda opt
       (read-char (if (null? opt) withfile:current-input (car opt))))))
-
+;@
 (define read
   (let ((read read))
     (lambda opt
       (read (if (null? opt) withfile:current-input (car opt))))))
-
+;@
 (define write-char
   (let ((write-char write-char))
     (lambda (obj . opt)
       (write-char obj (if (null? opt) withfile:current-output (car opt))))))
-
+;@
 (define write
   (let ((write write))
     (lambda (obj . opt)
       (write obj (if (null? opt) withfile:current-output (car opt))))))
-
+;@
 (define display
   (let ((display display))
     (lambda (obj . opt)
       (display obj (if (null? opt) withfile:current-output (car opt))))))
-
+;@
 (define newline
   (let ((newline newline))
     (lambda opt
       (newline (if (null? opt) withfile:current-output (car opt))))))
-
+;@
 (define force-output
   (let ((force-output force-output))
     (lambda opt