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, 8 insertions, 10 deletions

diff --git a/object.scm b/object.scm
index 2055224..298baad 100644
--- a/object.scm
+++ b/object.scm
@@ -23,11 +23,11 @@
   (if (object? obj)
       ((vector-ref obj 4))
       (slib:error "Cannot get methods on non-object: " obj)))
-
+;@
 (define (object? obj)
   (and (vector? obj)
        (eq? object:tag (vector-ref obj 0))))
-
+;@
 (define (make-method! obj generic-method method)
   (if (object? obj)
       (if (procedure? method)
@@ -36,22 +36,22 @@
 	    method)
 	  (slib:error "Method must be a procedure: " method))
       (slib:error "Cannot make method on non-object: " obj)))
-
+;@
 (define (get-method obj generic-method)
   (if (object? obj)
       ((vector-ref obj 1) generic-method)
       (slib:error "Cannot get method on non-object: " obj)))
-
+;@
 (define (unmake-method! obj generic-method)
   (if (object? obj)
       ((vector-ref obj 3) generic-method)
       (slib:error "Cannot unmake method on non-object: " obj)))
-
+;@
 (define (make-predicate! obj generic-predicate)
   (if (object? obj)
       ((vector-ref obj 2) generic-predicate (lambda (self) #t))
       (slib:error "Cannot make predicate on non-object: " obj)))
-
+;@
 (define (make-generic-method . exception-procedure)
   (define generic-method
     (lambda (obj . operands)
@@ -70,7 +70,7 @@
 	    (lambda (obj . params)
 	      (slib:error "Operation not supported: " obj))))
   generic-method)
-
+;@
 (define (make-generic-predicate)
   (define generic-predicate
     (lambda (obj)
@@ -80,7 +80,7 @@
 	      #f)
 	  #f)))
   generic-predicate)
-
+;@
 (define (make-object . ancestors)
   (define method-list
     (apply append (map (lambda (obj) (get-all-methods obj)) ancestors)))
@@ -95,5 +95,3 @@
     (let ((method-def (assq generic-method method-list)))
       (if method-def (cdr method-def) #f)))
   (vector object:tag get-method make-method! unmake-method! all-methods))
-
-