r4631: Auto commit for Debian build

diff --git a/hyperobject.asd b/hyperobject.asd
index 16e32cc3b759f2e2ee984d7b19c0e409d74cbd74..91d2d2b0454ae1bed74c99c269c747403fced19a 100644 (file)
--- a/hyperobject.asd
+++ b/hyperobject.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: hyperobject.asd,v 1.19 2003/04/03 17:01:17 kevin Exp $
+;;;; $Id: hyperobject.asd,v 1.20 2003/04/25 04:53:52 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -18,23 +18,21 @@
 (defsystem :hyperobject 
   :name "cl-hyperobject"
   :author "Kevin M. Rosenberg <kevin@rosenberg.net>"
-  :version "2.6.0"
+  :version "2.6.x"
   :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
   :licence "BSD-like License"
 
-  :perform (load-op :after (op hyperobject)
-                     (pushnew :hyperobject cl:*features*))
-    :components 
-    ((:file "package")
-     (:file "metaclass" :depends-on ("package"))
-     (:file "mop" :depends-on ("metaclass"))
-     (:file "rules" :depends-on ("mop"))
-     (:file "connect" :depends-on ("mop"))
-     (:file "sql" :depends-on ("connect"))
-     (:file "views" :depends-on ("mop"))
-     (:file "base-class" :depends-on ("views" "sql" "rules"))
-     (:file "wrapper" :depends-on ("base-class"))
-     )
-     :depends-on (:kmrcl :clsql))
+  :components 
+  ((:file "package")
+   (:file "metaclass" :depends-on ("package"))
+   (:file "mop" :depends-on ("metaclass"))
+   (:file "rules" :depends-on ("mop"))
+   (:file "connect" :depends-on ("mop"))
+   (:file "sql" :depends-on ("connect"))
+   (:file "views" :depends-on ("mop"))
+   (:file "base-class" :depends-on ("views" "sql" "rules"))
+   (:file "wrapper" :depends-on ("base-class"))
+   )
+  :depends-on (:kmrcl :clsql))
 
 

diff --git a/mop.lisp b/mop.lisp
index ae294581e60db4fdd9130e152308bff335931a4f..49c6d9789cc2da19d6644969a87391e2a9c81844 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.61 2003/04/22 14:19:08 kevin Exp $
+;;;; $Id: mop.lisp,v 1.62 2003/04/25 04:53:52 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -84,7 +84,10 @@
 
 (defclass hyperlink ()
   ((name :type symbol :initform nil :initarg :name :reader name)
-   (lookup :type (or function symbol) :initform nil :initarg :lookup :reader lookup)
+   (lookup
+    ;; The type specifier seems to break sbcl
+    ;; :type (or function symbol)
+    :initform nil :initarg :lookup :reader lookup)
    (link-parameters :type list :initform nil :initarg :link-parameters
                    :reader link-parameters)))