Fix previous patch for SBCL so that patch works on non-SBCL systems

diff --git a/ChangeLog b/ChangeLog
index 21b84f47d373a707ff7a07000b6cf5be0e5f83a2..b9dc6067f0b4ee5c0343ae990c4ae9d96ccb4c37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 5.3.1
+       * sql/metaclasses.lisp: Fix previous patch to work
+       on non-SBCL systems
+
 2011-03-29  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 5.3.0
        * sql/metaclasses.lisp: Apply one-line patch to fix

diff --git a/debian/changelog b/debian/changelog
index 37ed1f51efdf3ed671f1022ecc15a880314f2a70..691d37dfddb4f9edf40da0843d1caa58ea48ff1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (5.3.1-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 30 Mar 2011 23:32:06 -0600
+
 cl-sql (5.3.0-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index 20645de7dd7865dc8406dd68fae2e72ec76958e6..d942c6ddc9a0e10d51ee3c4f0391459bd5188de4 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -319,7 +319,7 @@ column definition in the database.")
     :accessor view-class-slot-autoincrement-sequence
     :initarg :autoincrement-sequence
     :initform nil
-    :documentation "A string naming the (possibly automatically generated) sequence 
+    :documentation "A string naming the (possibly automatically generated) sequence
 for a slot with an :auto-increment constraint.")))
 
 (defparameter *db-info-lambda-list*
@@ -536,7 +536,9 @@ implementations."
          ;; defclass expansion, which is too early for the CLSQL type
          ;; conversion to take place. This gets rid of it. It's ugly
          ;; but it's better than nothing -wcp10/4/10.
-         #+(and sbcl #.(cl:if (cl:find-symbol "%TYPE-CHECK-FUNCTION" :sb-pcl) '(and) '(or)))
+         #+(and sbcl #.(cl:if (cl:and (cl:find-package :sb-pcl)
+                                      (cl:find-symbol "%TYPE-CHECK-FUNCTION" :sb-pcl))
+                              '(list 'cl:and) '(list 'cl:or)))
          (setf (slot-value esd 'sb-pcl::%type-check-function) nil)
 
          )