From 736227185dd5fcda15796ef2a0da1bebb82ee9e5 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 May 2003 02:45:08 +0000 Subject: [PATCH] r4863: Auto commit for Debian build --- base/package.lisp | 9 ++++----- clsql-aodbc.asd | 8 ++++---- clsql-base.asd | 12 +++++------- clsql-mysql.asd | 6 +++--- clsql-oracle.asd | 8 ++++---- clsql-postgresql-socket.asd | 8 ++++---- clsql-postgresql.asd | 9 ++++----- clsql-tests.asd | 5 ++--- clsql-uffi.asd | 10 ++++------ clsql.asd | 7 ++++--- db-aodbc/aodbc-package.lisp | 10 +++++----- db-mysql/mysql-package.lisp | 9 ++++----- .../postgresql-socket-package.lisp | 9 ++++----- db-postgresql/postgresql-package.lisp | 11 +++++------ debian/changelog | 6 ++++++ sql/package.lisp | 14 ++++++-------- tests/package.lisp | 5 +++-- uffi/clsql-uffi-package.lisp | 9 ++++----- 18 files changed, 75 insertions(+), 80 deletions(-) diff --git a/base/package.lisp b/base/package.lisp index 18ce31b..b0cd10b 100644 --- a/base/package.lisp +++ b/base/package.lisp @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: package.lisp,v 1.1 2002/09/30 10:19:01 kevin Exp $ +;;;; $Id: package.lisp,v 1.2 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -18,15 +18,14 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) +(in-package #:cl-user) ;;;; This file makes the required package definitions for CLSQL's ;;;; core packages. (eval-when (:compile-toplevel :load-toplevel :execute) -(defpackage :clsql-base-sys - (:use :common-lisp) +(defpackage #:clsql-base-sys + (:use #:cl) (:export ;; "Private" exports for use by interface packages #:check-connection-spec diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd index a996f85..d593596 100644 --- a/clsql-aodbc.asd +++ b/clsql-aodbc.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-aodbc.asd,v 1.12 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: clsql-aodbc.asd,v 1.13 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,13 +16,13 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :asdf) +(defpackage #:clsql-aodbc-system (:use #:asdf #:cl)) +(in-package #:clsql-aodbc-system) #+(and allegro (not allegro-cl-trial)) -(defsystem :clsql-aodbc +(defsystem clsql-aodbc :name "cl-sql-aodbc" :author "Kevin M. Rosenberg " - :version "0.9.2" :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common Lisp SQL AODBC Driver" diff --git a/clsql-base.asd b/clsql-base.asd index 72e02b8..534f2a5 100644 --- a/clsql-base.asd +++ b/clsql-base.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: clsql-base.asd,v 1.18 2002/11/08 16:51:50 kevin Exp $ +;;;; $Id: clsql-base.asd,v 1.19 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,20 +16,18 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :asdf) +(defpackage #:clsql-base-system (:use #:asdf #:cl)) +(in-package #:clsql-base-system) #+(or allegro lispworks cmu sbcl openmcl mcl scl) -(defsystem :clsql-base +(defsystem clsql-base :name "cl-sql-base" - :author "Kevin M. Rosenberg " - :version "0.9.2" + :author "Kevin Rosenberg " :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common Lisp SQL Base Package" :long-description "cl-sql-base package provides the low-level interface for the database drivers." - :perform (load-op :after (op clsql-base) - (pushnew :clsql-base cl:*features*)) :components ((:module :base :components diff --git a/clsql-mysql.asd b/clsql-mysql.asd index 0fa706e..00982cc 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-mysql.asd,v 1.13 2002/10/16 11:51:04 kevin Exp $ +;;;; $Id: clsql-mysql.asd,v 1.14 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,7 +16,8 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :asdf) +(defpackage #:clsql-mysql-system (:use #:asdf #:cl)) +(in-package #:clsql-mysql-system) ;;; System definition @@ -24,7 +25,6 @@ (defsystem :clsql-mysql :name "cl-sql-mysql" :author "Kevin M. Rosenberg " - :version "0.9.2" :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common Lisp SQL MySQL Driver" diff --git a/clsql-oracle.asd b/clsql-oracle.asd index d783457..00e09e5 100644 --- a/clsql-oracle.asd +++ b/clsql-oracle.asd @@ -1,17 +1,17 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; This is copyrighted software. See interfaces/oracle/* files for terms. ;;;; -;;;; $Id: clsql-oracle.asd,v 1.12 2002/10/16 11:51:04 kevin Exp $ +;;;; $Id: clsql-oracle.asd,v 1.13 2003/05/07 02:45:08 kevin Exp $ -(in-package :asdf) +(defpackage #:clsql-oracle-system (:use #:asdf #:cl)) +(in-package #:clsql-oracle-system) ;;; System definition #+(or allegro lispworks cmu sbcl openmcl mcl scl) -(defsystem :clsql-oracle +(defsystem clsql-oracle :name "cl-sql-oracle" :author "Kevin M. Rosenberg " - :version "0.9.2" :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common Lisp SQL Oracle Driver" diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd index b8d0a63..eb39db3 100644 --- a/clsql-postgresql-socket.asd +++ b/clsql-postgresql-socket.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-postgresql-socket.asd,v 1.15 2003/03/02 20:02:02 kevin Exp $ +;;;; $Id: clsql-postgresql-socket.asd,v 1.16 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,15 +16,15 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :asdf) +(defpackage #:clsql-postgresql-socket-system (:use #:asdf #:cl)) +(in-package #:clsql-postgresql-socket-system) ;;; System definition #+(or allegro lispworks cmu sbcl openmcl mcl scl) -(defsystem :clsql-postgresql-socket +(defsystem clsql-postgresql-socket :name "cl-sql-postgresql-socket" :author "Kevin M. Rosenberg " - :version "0.9.2" :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common Lisp SQL PostgreSQL Socket Driver" diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd index 204a59c..33f485d 100644 --- a/clsql-postgresql.asd +++ b/clsql-postgresql.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-postgresql.asd,v 1.13 2002/10/16 11:51:04 kevin Exp $ +;;;; $Id: clsql-postgresql.asd,v 1.14 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,14 +16,13 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :asdf) +(defpackage #:clsql-postgresql-system (:use #:asdf #:cl)) +(in-package #:clsql-postgresql-system) #+(or allegro lispworks cmu sbcl openmcl mcl scl) -(defsystem :clsql-postgresql +(defsystem clsql-postgresql :name "cl-sql-postgresql" :author "Kevin M. Rosenberg " - :version "0.9.2" :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common Lisp PostgreSQL API Driver" diff --git a/clsql-tests.asd b/clsql-tests.asd index 1988302..f9633ed 100644 --- a/clsql-tests.asd +++ b/clsql-tests.asd @@ -7,11 +7,10 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Apr 2003 ;;;; -;;;; $Id: clsql-tests.asd,v 1.1 2003/05/02 03:05:54 kevin Exp $ +;;;; $Id: clsql-tests.asd,v 1.2 2003/05/07 02:45:08 kevin Exp $ ;;;; ************************************************************************* -(defpackage #:clsql-tests-system - (:use #:asdf #:cl)) +(defpackage #:clsql-tests-system (:use #:asdf #:cl)) (in-package #:clsql-tests-system) (defsystem clsql-tests diff --git a/clsql-uffi.asd b/clsql-uffi.asd index 21ef79a..c633488 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: clsql-uffi.asd,v 1.14 2002/10/16 11:51:04 kevin Exp $ +;;;; $Id: clsql-uffi.asd,v 1.15 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,17 +16,15 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :asdf) +(defpackage #:clsql-uffi-system (:use #:asdf #:cl)) +(in-package #:clsql-uffi-system) -;;; System definition #+(or allegro lispworks cmu sbcl openmcl mcl scl) -(defsystem :clsql-uffi +(defsystem clsql-uffi :name "cl-sql-base" :author "Kevin M. Rosenberg " - :version "0.9.2" :maintainer "Kevin M. Rosenberg " :licence "Lessor Lisp General Public License" :description "Common UFFI Helper functions for Common Lisp SQL Interface Library" diff --git a/clsql.asd b/clsql.asd index 55562fd..03faf1a 100644 --- a/clsql.asd +++ b/clsql.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: clsql.asd,v 1.17 2003/05/02 03:05:54 kevin Exp $ +;;;; $Id: clsql.asd,v 1.18 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,10 +16,11 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :asdf) +(defpackage #:clsql-system (:use #:asdf #:cl)) +(in-package #:clsql-system) #+(or allegro lispworks cmu sbcl openmcl mcl scl) -(defsystem :clsql +(defsystem clsql :name "clsql" :author "Kevin Rosenberg " :maintainer "Kevin M. Rosenberg " diff --git a/db-aodbc/aodbc-package.lisp b/db-aodbc/aodbc-package.lisp index 82137e7..aa7cca8 100644 --- a/db-aodbc/aodbc-package.lisp +++ b/db-aodbc/aodbc-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aodbc-package.lisp,v 1.3 2003/05/02 04:42:14 kevin Exp $ +;;;; $Id: aodbc-package.lisp,v 1.4 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,15 +16,15 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(in-package :cl-user) +(in-package #:cl-user) #+allegro (eval-when (:compile-toplevel :load-toplevel :execute) (require :aodbc-v2)) #-allegro (warn "This system requires Allegro's AODBC library to operate") -(defpackage :clsql-aodbc - (:nicknames :aodbc) - (:use :common-lisp :clsql-base-sys) +(defpackage #:clsql-aodbc + (:nicknames #:aodbc) + (:use :cl :clsql-base-sys) (:export #:aodbc-database) (:documentation "This is the CLSQL interface to Allegro's AODBC")) diff --git a/db-mysql/mysql-package.lisp b/db-mysql/mysql-package.lisp index 12d6bef..7c74f09 100644 --- a/db-mysql/mysql-package.lisp +++ b/db-mysql/mysql-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: mysql-package.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ +;;;; $Id: mysql-package.lisp,v 1.3 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,11 +16,10 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) +(in-package #:cl-user) -(defpackage :mysql - (:use #:common-lisp #:clsql-uffi) +(defpackage #:mysql + (:use #:cl #:clsql-uffi) (:export #:database-library-loaded diff --git a/db-postgresql-socket/postgresql-socket-package.lisp b/db-postgresql-socket/postgresql-socket-package.lisp index 23b7747..2dbcf4c 100644 --- a/db-postgresql-socket/postgresql-socket-package.lisp +++ b/db-postgresql-socket/postgresql-socket-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-package.lisp,v 1.3 2002/10/21 07:45:50 kevin Exp $ +;;;; $Id: postgresql-socket-package.lisp,v 1.4 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,13 +16,12 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) +(in-package #:cl-user) #+lispworks (require "comm") -(defpackage :postgresql-socket - (:use #:common-lisp) +(defpackage #:postgresql-socket + (:use #:cl) (:export #:pgsql-ftype #:pgsql-ftype#bytea #:pgsql-ftype#int2 diff --git a/db-postgresql/postgresql-package.lisp b/db-postgresql/postgresql-package.lisp index cd007c6..60c6571 100644 --- a/db-postgresql/postgresql-package.lisp +++ b/db-postgresql/postgresql-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-package.lisp,v 1.1 2002/09/30 10:19:23 kevin Exp $ +;;;; $Id: postgresql-package.lisp,v 1.2 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,12 +16,11 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) +(in-package #:cl-user) -(defpackage :postgresql - (:nicknames :pgsql) - (:use :common-lisp :clsql-uffi) +(defpackage #:postgresql + (:nicknames #:pgsql) + (:use #:cl #:clsql-uffi) (:export #:pgsql-oid #:pgsql-conn-status-type diff --git a/debian/changelog b/debian/changelog index b54a589..0a37ac9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (1.5.4-1) unstable; urgency=low + + * Improve .asd files + + -- Kevin M. Rosenberg Tue, 6 May 2003 18:30:19 -0600 + cl-sql (1.5.3-1) unstable; urgency=low * New upstream diff --git a/sql/package.lisp b/sql/package.lisp index 2d0ab0d..0b83468 100644 --- a/sql/package.lisp +++ b/sql/package.lisp @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: package.lisp,v 1.3 2002/10/21 14:11:09 kevin Exp $ +;;;; $Id: package.lisp,v 1.4 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -18,16 +18,14 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) - +(in-package #:cl-user) (eval-when (:compile-toplevel :load-toplevel :execute) - (defpackage :clsql-sys - (:nicknames :clsql) - (:use :common-lisp :clsql-base-sys) + (defpackage #:clsql-sys + (:nicknames #:clsql) + (:use #:cl #:clsql-base-sys) (:import-from - :clsql-base + #:clsql-base . #1=( #:clsql-condition diff --git a/tests/package.lisp b/tests/package.lisp index 706af43..144f2e1 100644 --- a/tests/package.lisp +++ b/tests/package.lisp @@ -7,11 +7,12 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Apr 2003 ;;;; -;;;; $Id: package.lisp,v 1.2 2003/05/02 03:26:46 kevin Exp $ +;;;; $Id: package.lisp,v 1.3 2003/05/07 02:45:08 kevin Exp $ ;;;; ************************************************************************* +(in-package #:cl-user) + (defpackage #:clsql-tests (:use #:asdf #:cl #:clsql #:rtest #:util.test)) -(in-package #:clsql-tests) diff --git a/uffi/clsql-uffi-package.lisp b/uffi/clsql-uffi-package.lisp index c2eb33d..f9c313c 100644 --- a/uffi/clsql-uffi-package.lisp +++ b/uffi/clsql-uffi-package.lisp @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: clsql-uffi-package.lisp,v 1.2 2002/10/14 04:09:02 kevin Exp $ +;;;; $Id: clsql-uffi-package.lisp,v 1.3 2003/05/07 02:45:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,11 +16,10 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) +(in-package #:cl-user) -(defpackage :clsql-uffi - (:use #:common-lisp) +(defpackage #:clsql-uffi + (:use #:cl #:uffi) (:export #:canonicalize-type-list #:convert-raw-field -- 2.34.1