r2842: *** empty log message ***

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 1f6f734b90ccf1dac2089568318cc20818fbf814..8f3a961bc2cdff2ed425c8510446b3cfd3ea0fef 100644 (file)
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;

-;;;; $Id: clsql-aodbc.asd,v 1.10 2002/09/20 01:40:54 kevin Exp $
+;;;; $Id: clsql-aodbc.asd,v 1.11 2002/09/25 12:44:59 kevin Exp $

 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -18,6 +18,7 @@
 
 (in-package :asdf)
 
 
 (in-package :asdf)
 

+#+(and allegro (not allegro-cl-trial))

 (defsystem :clsql-aodbc
   :name "cl-sql-aodbc"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
 (defsystem :clsql-aodbc
   :name "cl-sql-aodbc"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -34,6 +35,7 @@
               (:file "aodbc-sql" :depends-on ("aodbc-package")))))
     :depends-on (:clsql-base))
 
               (:file "aodbc-sql" :depends-on ("aodbc-package")))))
     :depends-on (:clsql-base))
 

+#+(and allegro (not allegro-cl-trial))

 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-aodbc)))) 
    "cl")
 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-aodbc)))) 
    "cl")

diff --git a/clsql-base.asd b/clsql-base.asd
index bf75d30dab8006cc99f08846a0a9a91421010e30..9ac0fde7b8a46e156f1b131a7793318b87b78cfc 100644 (file)
--- a/clsql-base.asd
+++ b/clsql-base.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;

-;;;; $Id: clsql-base.asd,v 1.13 2002/09/20 06:37:39 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.14 2002/09/25 12:44:59 kevin Exp $

 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -18,6 +18,7 @@
 
 (in-package :asdf)
 
 
 (in-package :asdf)
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defsystem :clsql-base
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
 (defsystem :clsql-base
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -40,10 +41,12 @@
             (:file "db-interface" :depends-on ("conditions"))
             (:file "initialize" :depends-on ("db-interface"))))))
 
             (:file "db-interface" :depends-on ("conditions"))
             (:file "initialize" :depends-on ("db-interface"))))))
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-base)))) 
    "cl")
 
 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-base)))) 
    "cl")
 

+#+(or allegro lispworks cmu openmcl mcl)

 (when (ignore-errors (find-class 'load-compiled-op))
   (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql-base))))
     (pushnew :clsql-base cl:*features*)))
 (when (ignore-errors (find-class 'load-compiled-op))
   (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql-base))))
     (pushnew :clsql-base cl:*features*)))

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index aaae2afcc07ce798485feb79f016e25c99109b0e..975c588f8aabd97eccfa54e286d980fec0d3b676 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r

-;;;; $Id: clsql-mysql.asd,v 1.9 2002/09/20 06:37:39 kevin Exp $\r
+;;;; $Id: clsql-mysql.asd,v 1.10 2002/09/25 12:44:59 kevin Exp $\r

 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r


@@ -20,6 +20,7 @@
 \r
 ;;; System definition\r
 \r
 \r
 ;;; System definition\r
 \r

+#+(or allegro lispworks cmu openmcl mcl)\r

 (defsystem :clsql-mysql\r
   :name "cl-sql-mysql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r
 (defsystem :clsql-mysql\r
   :name "cl-sql-mysql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r


@@ -39,6 +40,7 @@
             (:file "mysql-usql" :depends-on ("mysql-sql")))))\r
   :depends-on (:uffi :clsql-base :clsql-uffi))\r
    \r
             (:file "mysql-usql" :depends-on ("mysql-sql")))))\r
   :depends-on (:uffi :clsql-base :clsql-uffi))\r
    \r

+#+(or allegro lispworks cmu openmcl mcl)\r

 (defmethod source-file-type  ((c cl-source-file)\r
                              (s (eql (find-system :clsql-mysql)))) \r
    "cl")\r
 (defmethod source-file-type  ((c cl-source-file)\r
                              (s (eql (find-system :clsql-mysql)))) \r
    "cl")\r

diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 6cd61e11f5a201e2752702600f6a6429e0eee6cc..e8b9f98ee9875d9633cb265ef0aaeab5ccd742b5 100644 (file)
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -1,12 +1,13 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 

-;;;; $Id: clsql-oracle.asd,v 1.8 2002/09/20 01:40:54 kevin Exp $
+;;;; $Id: clsql-oracle.asd,v 1.9 2002/09/25 12:44:59 kevin Exp $

 
 (in-package :asdf)
 
 ;;; System definition
 
 
 (in-package :asdf)
 
 ;;; System definition
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defsystem :clsql-oracle
   :name "cl-sql-oracle"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
 (defsystem :clsql-oracle
   :name "cl-sql-oracle"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -28,6 +29,7 @@
               (:file "oracle-objects" :depends-on ("oracle-sql")))))
     :depends-on (:clsql-base))
 
               (:file "oracle-objects" :depends-on ("oracle-sql")))))
     :depends-on (:clsql-base))
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-oracle)))) 
    "cl")
 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-oracle)))) 
    "cl")

diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index ee844077e4fb4a91d64d2147a346727e5520792a..5cc71c867594471325bdca3c2b6e9edddfa9a8c5 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r

-;;;; $Id: clsql-postgresql-socket.asd,v 1.9 2002/09/20 06:37:39 kevin Exp $\r
+;;;; $Id: clsql-postgresql-socket.asd,v 1.10 2002/09/25 12:44:59 kevin Exp $\r

 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r


@@ -20,6 +20,7 @@
 \r
 ;;; System definition\r
 \r
 \r
 ;;; System definition\r
 \r

+#+(or allegro lispworks cmu openmcl mcl)\r

 (defsystem :clsql-postgresql-socket\r
   :name "cl-sql-postgresql-socket"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r
 (defsystem :clsql-postgresql-socket\r
   :name "cl-sql-postgresql-socket"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r


@@ -39,6 +40,7 @@
                    :depends-on ("postgresql-socket-api")))))\r
   :depends-on (:clsql-base :uffi))\r
 \r
                    :depends-on ("postgresql-socket-api")))))\r
   :depends-on (:clsql-base :uffi))\r
 \r

+#+(or allegro lispworks cmu openmcl mcl)\r

 (defmethod source-file-type  ((c cl-source-file)\r
                              (s (eql (find-system :clsql-postgresql-socket)))) \r
    "cl")\r
 (defmethod source-file-type  ((c cl-source-file)\r
                              (s (eql (find-system :clsql-postgresql-socket)))) \r
    "cl")\r

diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 64b67a12d80d07dd5476ad00759cd5c81bc16292..fb61b84d30b2e3b517b307c082790c3b5c666954 100644 (file)
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r

-;;;; $Id: clsql-postgresql.asd,v 1.9 2002/09/20 06:37:39 kevin Exp $\r
+;;;; $Id: clsql-postgresql.asd,v 1.10 2002/09/25 12:44:59 kevin Exp $\r

 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r


@@ -19,6 +19,7 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 (in-package :asdf)\r
 \r
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 (in-package :asdf)\r
 \r

+#+(or allegro lispworks cmu openmcl mcl)\r

 (defsystem :clsql-postgresql\r
   :name "cl-sql-postgresql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r
 (defsystem :clsql-postgresql\r
   :name "cl-sql-postgresql"\r
   :author "Kevin M. Rosenberg <kmr@debian.org>"\r


@@ -38,6 +39,7 @@
             (:file "postgresql-usql" :depends-on ("postgresql-sql")))))\r
   :depends-on (:uffi :clsql-base :clsql-uffi))\r
 \r
             (:file "postgresql-usql" :depends-on ("postgresql-sql")))))\r
   :depends-on (:uffi :clsql-base :clsql-uffi))\r
 \r

+#+(or allegro lispworks cmu openmcl mcl)\r

 (defmethod source-file-type  ((c cl-source-file)\r
                              (s (eql (find-system :clsql-postgresql)))) \r
    "cl")\r
 (defmethod source-file-type  ((c cl-source-file)\r
                              (s (eql (find-system :clsql-postgresql)))) \r
    "cl")\r

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 803be550bfbd0c467b761e26e9a309a653a4b0e7..8c6918b80e7eb830f9779d240f22948bf0ae0254 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;

-;;;; $Id: clsql-uffi.asd,v 1.10 2002/09/20 01:40:54 kevin Exp $
+;;;; $Id: clsql-uffi.asd,v 1.11 2002/09/25 12:44:59 kevin Exp $

 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -22,6 +22,7 @@
 
 ;;; System definition
 
 
 ;;; System definition
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defsystem :clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
 (defsystem :clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -40,6 +41,7 @@
   :depends-on (:uffi :clsql-base))
 
 
   :depends-on (:uffi :clsql-base))
 
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-uffi)))) 
    "cl")
 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql-uffi)))) 
    "cl")

diff --git a/clsql.asd b/clsql.asd
index 06607abda4e2a6112bba8cb3bf40bcdd1e1689b2..0c7c27d4c776bb4afdb1a06b43709c66c11ab40f 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;

-;;;; $Id: clsql.asd,v 1.11 2002/09/20 06:37:39 kevin Exp $
+;;;; $Id: clsql.asd,v 1.12 2002/09/25 12:44:59 kevin Exp $

 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -18,6 +18,7 @@
 
 (in-package :asdf)
 
 
 (in-package :asdf)
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defsystem :clsql
   :name "cl-sql"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
 (defsystem :clsql
   :name "cl-sql"
   :author "Kevin M. Rosenberg <kmr@debian.org>"


@@ -42,11 +43,13 @@
   :depends-on (:clsql-base)
   )
 
   :depends-on (:clsql-base)
   )
 

+#+(or allegro lispworks cmu openmcl mcl)

 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql)))) 
    "cl")
 
 
 (defmethod source-file-type  ((c cl-source-file)
                              (s (eql (find-system :clsql)))) 
    "cl")
 
 

+#+(or allegro lispworks cmu openmcl mcl)

 (when (ignore-errors (find-class 'load-compiled-op))
   (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql))))
     (pushnew :clsql cl:*features*)))
 (when (ignore-errors (find-class 'load-compiled-op))
   (defmethod perform :after ((op load-compiled-op) (c (eql (find-system :clsql))))
     (pushnew :clsql cl:*features*)))

diff --git a/debian/changelog b/debian/changelog
index 68ff84cb851c70bd6dc95339d177e3e26924c599..0b1a0662bdbe50716455e45247ee21a5b87cb6ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+cl-sql (0.9.4-1) unstable; urgency=low
+
+  * Add reader conditionals to .asd file
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 25 Sep 2002 06:37:30 -0600
+

 cl-sql (0.9.3-2) unstable; urgency=low
 
 cl-sql (0.9.3-2) unstable; urgency=low
 

-  * Add call to common-lisp-only-compatible
+  * Add call to clc-only-compatible

 
  -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 22 Sep 2002 21:01:20 -0600
 
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 22 Sep 2002 21:01:20 -0600
 

diff --git a/debian/control b/debian/control
index b8b3cd63e3324c39e43060389a990596b15feb5a..bf979ccf507667e905eb1b897a9bcf14797bf995 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Description: SQL Interface for Common Lisp
 
 Package: cl-sql-base
 Architecture: any
 
 Package: cl-sql-base
 Architecture: any

-Depends: common-lisp-controller (>= 3.27)
+Depends: common-lisp-controller

 Recommends: cl-sql-backend
 Description: SQL Interface for Common Lisp
  CLSQL uses the UFFI library to provide SQL to multiple SQL databases
 Recommends: cl-sql-backend
 Description: SQL Interface for Common Lisp
  CLSQL uses the UFFI library to provide SQL to multiple SQL databases


@@ -24,7 +24,7 @@ Description: SQL Interface for Common Lisp
 
 Package: cl-sql-uffi
 Architecture: any
 
 Package: cl-sql-uffi
 Architecture: any

-Depends: common-lisp-controller (>= 3.27), cl-uffi, cl-sql-base
+Depends: common-lisp-controller, cl-uffi, cl-sql-base

 Recommends: cl-sql-backend
 Description: Common UFFI functions for CLSQL database backends
  This package provides an interface to several UFFI functions used by multiple CLSQL database backends.
 Recommends: cl-sql-backend
 Description: Common UFFI functions for CLSQL database backends
  This package provides an interface to several UFFI functions used by multiple CLSQL database backends.

diff --git a/debian/postinst.template b/debian/postinst.template
index 2bfd7344dd5c3b6c1a99c5077b94e1ef308f5095..8ab4c3520c224d56d866e801d71a78b2cb892349 100644 (file)
--- a/debian/postinst.template
+++ b/debian/postinst.template
@@ -5,8 +5,8 @@ pkg=%%
 
 case "$1" in
     configure)
 
 case "$1" in
     configure)

-       clc-only-compatible $pkg allegro cmucl lispworks openmcl
-       register-common-lisp-source $pkg
+       #clc-only-compatible $pkg allegro cmucl lispworks openmcl
+       /usr/sbin/register-common-lisp-source $pkg

        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        ;;
        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        ;;