From 7b296f477e74a6db6e319e6cb6dff16be44e6a60 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 18 Sep 2002 07:43:41 +0000
Subject: [PATCH] r2753: move files

---
 Makefile                                      |   8 +--
 {clsql-aodbc => db-aodbc}/.cvsignore          |   0
 {clsql-aodbc => db-aodbc}/Makefile            |   0
 {clsql-aodbc => db-aodbc}/aodbc-package.cl    |   2 +-
 {clsql-aodbc => db-aodbc}/aodbc-sql.cl        |   2 +-
 {clsql-mysql => db-mysql}/.cvsignore          |   0
 {clsql-mysql => db-mysql}/Makefile            |   2 +-
 {clsql-mysql => db-mysql}/Makefile.msvc       |   2 +-
 {clsql-mysql => db-mysql}/clsql-mysql.c       |   2 +-
 {clsql-mysql => db-mysql}/clsql-mysql.dll     | Bin
 {clsql-mysql => db-mysql}/clsql-mysql.lib     | Bin
 {clsql-mysql => db-mysql}/mysql-api.cl        |   2 +-
 {clsql-mysql => db-mysql}/mysql-loader.cl     |   2 +-
 {clsql-mysql => db-mysql}/mysql-package.cl    |   2 +-
 {clsql-mysql => db-mysql}/mysql-sql.cl        |   2 +-
 {clsql-mysql => db-mysql}/mysql-usql.cl       |   2 +-
 .../testing/mysql-struct-size.cc              |   0
 .../testing/mysql-struct-size.cl              |   0
 {clsql-oracle => db-oracle}/.cvsignore        |   0
 {clsql-oracle => db-oracle}/Makefile          |   0
 {clsql-oracle => db-oracle}/README            |   0
 .../alien-resources.cl                        |   2 +-
 .../oracle-constants.cl                       |   2 +-
 {clsql-oracle => db-oracle}/oracle-loader.cl  |   2 +-
 {clsql-oracle => db-oracle}/oracle-objects.cl |   0
 {clsql-oracle => db-oracle}/oracle-package.cl |   2 +-
 {clsql-oracle => db-oracle}/oracle-sql.cl     |   2 +-
 {clsql-oracle => db-oracle}/oracle.cl         |   2 +-
 .../.cvsignore                                |   0
 .../Makefile                                  |   0
 .../postgresql-socket-api.cl                  |   2 +-
 .../postgresql-socket-package.cl              |   2 +-
 .../postgresql-socket-sql.cl                  |   2 +-
 .../.cvsignore                                |   0
 {clsql-postgresql => db-postgresql}/Makefile  |   0
 .../postgresql-api.cl                         |   2 +-
 .../postgresql-loader.cl                      |   2 +-
 .../postgresql-package.cl                     |   2 +-
 .../postgresql-sql.cl                         |   2 +-
 .../postgresql-usql.cl                        |   2 +-
 debian/rules                                  |  66 +++++++++++-------
 41 files changed, 66 insertions(+), 56 deletions(-)
 rename {clsql-aodbc => db-aodbc}/.cvsignore (100%)
 rename {clsql-aodbc => db-aodbc}/Makefile (100%)
 rename {clsql-aodbc => db-aodbc}/aodbc-package.cl (94%)
 rename {clsql-aodbc => db-aodbc}/aodbc-sql.cl (98%)
 rename {clsql-mysql => db-mysql}/.cvsignore (100%)
 rename {clsql-mysql => db-mysql}/Makefile (96%)
 rename {clsql-mysql => db-mysql}/Makefile.msvc (94%)
 rename {clsql-mysql => db-mysql}/clsql-mysql.c (97%)
 rename {clsql-mysql => db-mysql}/clsql-mysql.dll (100%)
 rename {clsql-mysql => db-mysql}/clsql-mysql.lib (100%)
 rename {clsql-mysql => db-mysql}/mysql-api.cl (99%)
 rename {clsql-mysql => db-mysql}/mysql-loader.cl (98%)
 rename {clsql-mysql => db-mysql}/mysql-package.cl (98%)
 rename {clsql-mysql => db-mysql}/mysql-sql.cl (99%)
 rename {clsql-mysql => db-mysql}/mysql-usql.cl (95%)
 rename {clsql-mysql => db-mysql}/testing/mysql-struct-size.cc (100%)
 rename {clsql-mysql => db-mysql}/testing/mysql-struct-size.cl (100%)
 rename {clsql-oracle => db-oracle}/.cvsignore (100%)
 rename {clsql-oracle => db-oracle}/Makefile (100%)
 rename {clsql-oracle => db-oracle}/README (100%)
 rename {clsql-oracle => db-oracle}/alien-resources.cl (95%)
 rename {clsql-oracle => db-oracle}/oracle-constants.cl (99%)
 rename {clsql-oracle => db-oracle}/oracle-loader.cl (97%)
 rename {clsql-oracle => db-oracle}/oracle-objects.cl (100%)
 rename {clsql-oracle => db-oracle}/oracle-package.cl (85%)
 rename {clsql-oracle => db-oracle}/oracle-sql.cl (99%)
 rename {clsql-oracle => db-oracle}/oracle.cl (99%)
 rename {clsql-postgresql-socket => db-postgresql-socket}/.cvsignore (100%)
 rename {clsql-postgresql-socket => db-postgresql-socket}/Makefile (100%)
 rename {clsql-postgresql-socket => db-postgresql-socket}/postgresql-socket-api.cl (99%)
 rename {clsql-postgresql-socket => db-postgresql-socket}/postgresql-socket-package.cl (96%)
 rename {clsql-postgresql-socket => db-postgresql-socket}/postgresql-socket-sql.cl (99%)
 rename {clsql-postgresql => db-postgresql}/.cvsignore (100%)
 rename {clsql-postgresql => db-postgresql}/Makefile (100%)
 rename {clsql-postgresql => db-postgresql}/postgresql-api.cl (99%)
 rename {clsql-postgresql => db-postgresql}/postgresql-loader.cl (96%)
 rename {clsql-postgresql => db-postgresql}/postgresql-package.cl (97%)
 rename {clsql-postgresql => db-postgresql}/postgresql-sql.cl (99%)
 rename {clsql-postgresql => db-postgresql}/postgresql-usql.cl (98%)

diff --git a/Makefile b/Makefile
index ba054bd..4b7b229 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.22 2002/08/01 03:09:17 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.23 2002/09/18 07:43:40 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,7 +15,7 @@
 
 PKG	:= clsql
 DEBPKG	:= cl-sql
-SUBDIRS	:= clsql clsql-uffi clsql-base clsql-mysql clsql-aodbc \
+SUBDIRS	:= sql clsql-uffi base clsql-mysql clsql-aodbc \
 	   clsql-postgresql clsql-postgresql-socket 
 DOCSUBDIRS:=doc
 
@@ -30,10 +30,6 @@ all: $(LIBSUBDIRS)
 $(LIBSUBDIRS):
 	$(MAKE) -C $@
 
-.PHONY: distclean
-distclean: clean
-	@$(MAKE) -C doc $@
-
 SOURCE_FILES=interfaces sql cmucl-compat doc test-suite Makefile VERSION \
 	COPYING.CLSQL COPYING.MaiSQL README INSTALL ChangeLog NEWS TODO \
 	set-logical.cl clsql-uffi.system \
diff --git a/clsql-aodbc/.cvsignore b/db-aodbc/.cvsignore
similarity index 100%
rename from clsql-aodbc/.cvsignore
rename to db-aodbc/.cvsignore
diff --git a/clsql-aodbc/Makefile b/db-aodbc/Makefile
similarity index 100%
rename from clsql-aodbc/Makefile
rename to db-aodbc/Makefile
diff --git a/clsql-aodbc/aodbc-package.cl b/db-aodbc/aodbc-package.cl
similarity index 94%
rename from clsql-aodbc/aodbc-package.cl
rename to db-aodbc/aodbc-package.cl
index 958ead8..f00e0f2 100644
--- a/clsql-aodbc/aodbc-package.cl
+++ b/db-aodbc/aodbc-package.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: aodbc-package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: aodbc-package.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-aodbc/aodbc-sql.cl b/db-aodbc/aodbc-sql.cl
similarity index 98%
rename from clsql-aodbc/aodbc-sql.cl
rename to db-aodbc/aodbc-sql.cl
index 9ca6c76..b4b5403 100644
--- a/clsql-aodbc/aodbc-sql.cl
+++ b/db-aodbc/aodbc-sql.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: aodbc-sql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: aodbc-sql.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-mysql/.cvsignore b/db-mysql/.cvsignore
similarity index 100%
rename from clsql-mysql/.cvsignore
rename to db-mysql/.cvsignore
diff --git a/clsql-mysql/Makefile b/db-mysql/Makefile
similarity index 96%
rename from clsql-mysql/Makefile
rename to db-mysql/Makefile
index d1fcb4a..197d126 100644
--- a/clsql-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -7,7 +7,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.1 2002/08/01 03:06:26 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.1 2002/09/18 07:43:40 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
diff --git a/clsql-mysql/Makefile.msvc b/db-mysql/Makefile.msvc
similarity index 94%
rename from clsql-mysql/Makefile.msvc
rename to db-mysql/Makefile.msvc
index e8addd0..e7991f1 100644
--- a/clsql-mysql/Makefile.msvc
+++ b/db-mysql/Makefile.msvc
@@ -7,7 +7,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile.msvc,v 1.1 2002/08/01 03:06:26 kevin Exp $
+#  CVS Id:   $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
diff --git a/clsql-mysql/clsql-mysql.c b/db-mysql/clsql-mysql.c
similarity index 97%
rename from clsql-mysql/clsql-mysql.c
rename to db-mysql/clsql-mysql.c
index 9bd6e97..0d0ee4d 100644
--- a/clsql-mysql/clsql-mysql.c
+++ b/db-mysql/clsql-mysql.c
@@ -6,7 +6,7 @@
  *   Programmer:    Kevin M. Rosenberg
  *   Date Started:  Mar 2002
  *
- * $Id: clsql-mysql.c,v 1.1 2002/08/01 03:06:26 kevin Exp $
+ * $Id: clsql-mysql.c,v 1.1 2002/09/18 07:43:40 kevin Exp $
  *
  * This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
  *
diff --git a/clsql-mysql/clsql-mysql.dll b/db-mysql/clsql-mysql.dll
similarity index 100%
rename from clsql-mysql/clsql-mysql.dll
rename to db-mysql/clsql-mysql.dll
diff --git a/clsql-mysql/clsql-mysql.lib b/db-mysql/clsql-mysql.lib
similarity index 100%
rename from clsql-mysql/clsql-mysql.lib
rename to db-mysql/clsql-mysql.lib
diff --git a/clsql-mysql/mysql-api.cl b/db-mysql/mysql-api.cl
similarity index 99%
rename from clsql-mysql/mysql-api.cl
rename to db-mysql/mysql-api.cl
index 2c154dc..59a395b 100644
--- a/clsql-mysql/mysql-api.cl
+++ b/db-mysql/mysql-api.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-api.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: mysql-api.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-mysql/mysql-loader.cl b/db-mysql/mysql-loader.cl
similarity index 98%
rename from clsql-mysql/mysql-loader.cl
rename to db-mysql/mysql-loader.cl
index 64aad2e..e732c1e 100644
--- a/clsql-mysql/mysql-loader.cl
+++ b/db-mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-mysql/mysql-package.cl b/db-mysql/mysql-package.cl
similarity index 98%
rename from clsql-mysql/mysql-package.cl
rename to db-mysql/mysql-package.cl
index c8c5947..fcb3623 100644
--- a/clsql-mysql/mysql-package.cl
+++ b/db-mysql/mysql-package.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: mysql-package.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-mysql/mysql-sql.cl b/db-mysql/mysql-sql.cl
similarity index 99%
rename from clsql-mysql/mysql-sql.cl
rename to db-mysql/mysql-sql.cl
index f41a4d3..f3fb656 100644
--- a/clsql-mysql/mysql-sql.cl
+++ b/db-mysql/mysql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-sql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-mysql/mysql-usql.cl b/db-mysql/mysql-usql.cl
similarity index 95%
rename from clsql-mysql/mysql-usql.cl
rename to db-mysql/mysql-usql.cl
index 8b33b9d..0b56732 100644
--- a/clsql-mysql/mysql-usql.cl
+++ b/db-mysql/mysql-usql.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg and onShore Development Inc
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: mysql-usql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: mysql-usql.cl,v 1.1 2002/09/18 07:43:40 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and by onShore Development Inc.
diff --git a/clsql-mysql/testing/mysql-struct-size.cc b/db-mysql/testing/mysql-struct-size.cc
similarity index 100%
rename from clsql-mysql/testing/mysql-struct-size.cc
rename to db-mysql/testing/mysql-struct-size.cc
diff --git a/clsql-mysql/testing/mysql-struct-size.cl b/db-mysql/testing/mysql-struct-size.cl
similarity index 100%
rename from clsql-mysql/testing/mysql-struct-size.cl
rename to db-mysql/testing/mysql-struct-size.cl
diff --git a/clsql-oracle/.cvsignore b/db-oracle/.cvsignore
similarity index 100%
rename from clsql-oracle/.cvsignore
rename to db-oracle/.cvsignore
diff --git a/clsql-oracle/Makefile b/db-oracle/Makefile
similarity index 100%
rename from clsql-oracle/Makefile
rename to db-oracle/Makefile
diff --git a/clsql-oracle/README b/db-oracle/README
similarity index 100%
rename from clsql-oracle/README
rename to db-oracle/README
diff --git a/clsql-oracle/alien-resources.cl b/db-oracle/alien-resources.cl
similarity index 95%
rename from clsql-oracle/alien-resources.cl
rename to db-oracle/alien-resources.cl
index 57d50ba..6848762 100644
--- a/clsql-oracle/alien-resources.cl
+++ b/db-oracle/alien-resources.cl
@@ -1,5 +1,5 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id: alien-resources.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;; $Id: alien-resources.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 
 ;;; This is copyrighted software.  See documentation for terms.
 ;;; 
diff --git a/clsql-oracle/oracle-constants.cl b/db-oracle/oracle-constants.cl
similarity index 99%
rename from clsql-oracle/oracle-constants.cl
rename to db-oracle/oracle-constants.cl
index 219021f..245a2b4 100644
--- a/clsql-oracle/oracle-constants.cl
+++ b/db-oracle/oracle-constants.cl
@@ -1,5 +1,5 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id: oracle-constants.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;; $Id: oracle-constants.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 
 (in-package :clsql-oracle)
 
diff --git a/clsql-oracle/oracle-loader.cl b/db-oracle/oracle-loader.cl
similarity index 97%
rename from clsql-oracle/oracle-loader.cl
rename to db-oracle/oracle-loader.cl
index c1d5940..d35c5cc 100644
--- a/clsql-oracle/oracle-loader.cl
+++ b/db-oracle/oracle-loader.cl
@@ -1,5 +1,5 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id: oracle-loader.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;; $Id: oracle-loader.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;
 ;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases
 ;;; This is copyrighted software.  See documentation for terms.
diff --git a/clsql-oracle/oracle-objects.cl b/db-oracle/oracle-objects.cl
similarity index 100%
rename from clsql-oracle/oracle-objects.cl
rename to db-oracle/oracle-objects.cl
diff --git a/clsql-oracle/oracle-package.cl b/db-oracle/oracle-package.cl
similarity index 85%
rename from clsql-oracle/oracle-package.cl
rename to db-oracle/oracle-package.cl
index c5f46b6..ef25caf 100644
--- a/clsql-oracle/oracle-package.cl
+++ b/db-oracle/oracle-package.cl
@@ -1,5 +1,5 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id: oracle-package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;; $Id: oracle-package.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;
 ;;; This is copyrighted software.  See documentation for terms.
 
diff --git a/clsql-oracle/oracle-sql.cl b/db-oracle/oracle-sql.cl
similarity index 99%
rename from clsql-oracle/oracle-sql.cl
rename to db-oracle/oracle-sql.cl
index d70392c..76fdad6 100644
--- a/clsql-oracle/oracle-sql.cl
+++ b/db-oracle/oracle-sql.cl
@@ -1,5 +1,5 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id: oracle-sql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;; $Id: oracle-sql.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 
 ;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases
 ;;; This is copyrighted software.  See documentation for terms.
diff --git a/clsql-oracle/oracle.cl b/db-oracle/oracle.cl
similarity index 99%
rename from clsql-oracle/oracle.cl
rename to db-oracle/oracle.cl
index 72c9393..bde69eb 100644
--- a/clsql-oracle/oracle.cl
+++ b/db-oracle/oracle.cl
@@ -1,5 +1,5 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id: oracle.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;; $Id: oracle.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 
 ;;; MaiSQL --- Common Lisp Interface Layer to SQL Databases
 ;;; This is copyrighted software.  See documentation for terms.
diff --git a/clsql-postgresql-socket/.cvsignore b/db-postgresql-socket/.cvsignore
similarity index 100%
rename from clsql-postgresql-socket/.cvsignore
rename to db-postgresql-socket/.cvsignore
diff --git a/clsql-postgresql-socket/Makefile b/db-postgresql-socket/Makefile
similarity index 100%
rename from clsql-postgresql-socket/Makefile
rename to db-postgresql-socket/Makefile
diff --git a/clsql-postgresql-socket/postgresql-socket-api.cl b/db-postgresql-socket/postgresql-socket-api.cl
similarity index 99%
rename from clsql-postgresql-socket/postgresql-socket-api.cl
rename to db-postgresql-socket/postgresql-socket-api.cl
index e0109da..b64bdea 100644
--- a/clsql-postgresql-socket/postgresql-socket-api.cl
+++ b/db-postgresql-socket/postgresql-socket-api.cl
@@ -9,7 +9,7 @@
 ;;;;                
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-socket-api.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-socket-api.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-postgresql-socket/postgresql-socket-package.cl b/db-postgresql-socket/postgresql-socket-package.cl
similarity index 96%
rename from clsql-postgresql-socket/postgresql-socket-package.cl
rename to db-postgresql-socket/postgresql-socket-package.cl
index 650960b..9b46110 100644
--- a/clsql-postgresql-socket/postgresql-socket-package.cl
+++ b/db-postgresql-socket/postgresql-socket-package.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-socket-package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-socket-package.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-postgresql-socket/postgresql-socket-sql.cl b/db-postgresql-socket/postgresql-socket-sql.cl
similarity index 99%
rename from clsql-postgresql-socket/postgresql-socket-sql.cl
rename to db-postgresql-socket/postgresql-socket-sql.cl
index 9948131..4532dc2 100644
--- a/clsql-postgresql-socket/postgresql-socket-sql.cl
+++ b/db-postgresql-socket/postgresql-socket-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-socket-sql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-postgresql/.cvsignore b/db-postgresql/.cvsignore
similarity index 100%
rename from clsql-postgresql/.cvsignore
rename to db-postgresql/.cvsignore
diff --git a/clsql-postgresql/Makefile b/db-postgresql/Makefile
similarity index 100%
rename from clsql-postgresql/Makefile
rename to db-postgresql/Makefile
diff --git a/clsql-postgresql/postgresql-api.cl b/db-postgresql/postgresql-api.cl
similarity index 99%
rename from clsql-postgresql/postgresql-api.cl
rename to db-postgresql/postgresql-api.cl
index 5b686eb..1e04187 100644
--- a/clsql-postgresql/postgresql-api.cl
+++ b/db-postgresql/postgresql-api.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-api.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-api.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-postgresql/postgresql-loader.cl b/db-postgresql/postgresql-loader.cl
similarity index 96%
rename from clsql-postgresql/postgresql-loader.cl
rename to db-postgresql/postgresql-loader.cl
index 9e44e80..ac1729b 100644
--- a/clsql-postgresql/postgresql-loader.cl
+++ b/db-postgresql/postgresql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-loader.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-postgresql/postgresql-package.cl b/db-postgresql/postgresql-package.cl
similarity index 97%
rename from clsql-postgresql/postgresql-package.cl
rename to db-postgresql/postgresql-package.cl
index 34f6c00..ab6e5f2 100644
--- a/clsql-postgresql/postgresql-package.cl
+++ b/db-postgresql/postgresql-package.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-package.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-postgresql/postgresql-sql.cl b/db-postgresql/postgresql-sql.cl
similarity index 99%
rename from clsql-postgresql/postgresql-sql.cl
rename to db-postgresql/postgresql-sql.cl
index dfab1a7..54295d5 100644
--- a/clsql-postgresql/postgresql-sql.cl
+++ b/db-postgresql/postgresql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-sql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-postgresql/postgresql-usql.cl b/db-postgresql/postgresql-usql.cl
similarity index 98%
rename from clsql-postgresql/postgresql-usql.cl
rename to db-postgresql/postgresql-usql.cl
index 08e2a7b..6d63260 100644
--- a/clsql-postgresql/postgresql-usql.cl
+++ b/db-postgresql/postgresql-usql.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg and onShore Development Inc
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: postgresql-usql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: postgresql-usql.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and by onShore Development Inc.
diff --git a/debian/rules b/debian/rules
index b263192..42ae714 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,15 +23,15 @@ all-pkgs	:= $(pkg) $(pkg-base) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socke
 UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
 
 ## Lisp sources
-srcs		:= clsql clsql.asd
-srcs-base	:= clsql-base clsql-base.asd
-srcs-base-uffi	:= clsql-uffi clsql-uffi.asd
-srcs-base-uffi-so:= $(wildcard clsql-uffi/*.so)
-srcs-mysql	:= clsql-mysql clsql-mysql.asd
+srcs		:= sql clsql.asd
+srcs-base	:= $(wildcard base/*.cl) 
+srcs-uffi	:= $(wildcard clsql-uffi/*.cl) $(wildcard clsql-uffi/*.c)
+srcs-uffi-so:= $(wildcard clsql-uffi/*.so)
+srcs-mysql	:= $(wildcard clsql-mysql/*.cl) $(wildcard clsql-mysql/*.c)
 srcs-mysql-so	:=  $(wildcard clsql-mysql/*.so)
-srcs-pg		:= clsql-postgresql clsql-postgresql.asd
-srcs-pg-socket	:= clsql-postgresql-socket clsql-postgresql-socket.asd
-srcs-aodbc	:= clsql-aodbc clsql-aodbc.asd
+srcs-pg		:= $(wildcard clsql-postgresql/*.cl)
+srcs-pg-socket	:= $(wildcard clsql-postgresql-socket/*.cl)
+srcs-aodbc	:= $(wildcard clsql-aodbc/*.cl)
 
 clc-base	:= usr/share/common-lisp
 clc-source	:= $(clc-base)/source
@@ -40,15 +40,22 @@ doc-dir		:= usr/share/doc/cl-sql-base
 
 clc-clsql	:= $(clc-source)/$(plain-pkg)
 
-lispdir-sql	:= $(clc-source)/clsql
-lispdir-base	:= $(clc-source)/clsql-base
-lispdir-base-uffi := $(clc-source)/clsql-uffi
-sodir-base-uffi := usr/lib/clsql
-lispdir-mysql	:= $(clc-source)/clsql-mysql
+clc-sql		:= $(clc-source)/clsql
+lispdir-sql	:= $(clc-sql)/sql
+clc-base	:= $(clc-source)/clsql-base
+lispdir-base	:= $(clc-base)/base
+clc-uffi	 := $(clc-source)/clsql-uffi
+lispdir-uffi := $(clc-uffi)/clsql-uffi
+sodir-uffi := usr/lib/clsql
+clc-mysql	:= $(clc-source)/clsql-mysql
+lispdir-mysql	:= $(clc-mysql)/clsql-mysql
 sodir-mysql	:= usr/lib/clsql
-lispdir-pg	:= $(clc-source)/clsql-postgresql
-lispdir-pg-socket := $(clc-source)/clsql-postgresql-socket
-lispdir-aodbc	:= $(clc-source)/clsql-aodbc
+clc-pg		:= $(clc-source)/clsql-postgresql
+lispdir-pg	:= $(clc-pg)/clsql-postgresql
+clc-socket := $(clc-source)/clsql-postgresql-socket
+lispdir-pg-socket := $(clc-pg-socket)/clsql-postgresql-socket
+clc-aodbc	:= $(clc-source)/clsql-aodbc
+lispdir-aodbc	:= $(clc-aodbc)/clsql-aodbc
 
 
 configure: configure-stamp
@@ -81,7 +88,7 @@ install: build
 	dh_installdirs --all  $(clc-systems) $(clc-source)
 	dh_installdirs -p $(pkg) $(lispdir-sql)
 	dh_installdirs -p $(pkg-base) $(lispdir-base)
-	dh_installdirs -p $(pkg-uffi) $(lispdir-base-uffi) $(sodir-base-uffi)
+	dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
 	dh_installdirs -p $(pkg-pg) $(lispdir-pg)
 	dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
 	dh_installdirs -p $(pkg-mysql) $(lispdir-mysql) $(sodir-mysql)
@@ -89,29 +96,36 @@ install: build
 
 	# Main package
 	dh_install -p $(pkg) $(srcs) $(lispdir-sql)
+	dh_install -p $(pkg) clsql.asd $(clc-clsql)
 
 	# Base
 	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
+	dh_install -p $(pkg-base) clsql-base.asd $(clc-base)
 
 	# UFFI
-	dh_install -p $(pkg-uffi) $(srcs-base-uffi) $(lispdir-base-uffi)
-	dh_install -p $(pkg-uffi) $(srcs-base-uffi-so) $(sodir-base-uffi)
+	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
+	dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
+	dh_install -p $(pkg-uffi) clsql-uffi.asd $(clc-uffi)
 
 	# Backends
 	dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
+	dh_install -p $(pkg-mysql) clsql-mysql.asd $(clc-mysql)
 	dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
 	dh_install -p $(pkg-pg) $(srcs-pg) $(lispdir-pg)
+	dh_install -p $(pkg-pg) clsql-postgresql.asd $(clc-pg)
 	dh_install -p $(pkg-pg-socket) $(srcs-pg-socket) $(lispdir-pg-socket)
+	dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.asd $(clc-pg-socket)
 	dh_install -p $(pkg-aodbc) $(srcs-aodbc) $(lispdir-aodbc)
+	dh_install -p $(pkg-aodbc) clsql-aodbc.asd $(clc-aodbc)
 
 	# CLC Systems
-	dh_link -p $(pkg) $(lispdir-sql)/clsql.asd $(clc-systems)/clsql.asd
-	dh_link -p $(pkg-base) $(lispdir-base)/clsql-base.asd $(clc-systems)/clsql-base.asd
-	dh_link -p $(pkg-uffi) $(lispdir-base-uffi)/clsql-uffi.asd $(clc-systems)/clsql-uffi.asd
-	dh_link -p $(pkg-mysql) $(lispdir-mysql)/clsql-mysql.asd $(clc-systems)/clsql-mysql.asd
-	dh_link -p $(pkg-pg) $(lispdir-pg)/clsql-postgresql.asd $(clc-systems)/clsql-postgresql.asd
-	dh_link -p $(pkg-pg-socket) $(lispdir-pg-socket)/clsql-postgresql-socket.asd $(clc-systems)/clsql-postgresql-socket.asd
-	dh_link -p $(pkg-aodbc) $(lispdir-aodbc)/clsql-aodbc.asd $(clc-systems)/clsql-aodbc.asd
+	dh_link -p $(pkg) $(clc-clsql)/clsql.asd $(clc-systems)/clsql.asd
+	dh_link -p $(pkg-base) $(clc-base)/clsql-base.asd $(clc-systems)/clsql-base.asd
+	dh_link -p $(pkg-uffi) $(clc-uffi)/clsql-uffi.asd $(clc-systems)/clsql-uffi.asd
+	dh_link -p $(pkg-mysql) $(clc-mysql)/clsql-mysql.asd $(clc-systems)/clsql-mysql.asd
+	dh_link -p $(pkg-pg) $(clc-pg)/clsql-postgresql.asd $(clc-systems)/clsql-postgresql.asd
+	dh_link -p $(pkg-pg-socket) $(clc-pg-socket)/clsql-postgresql-socket.asd $(clc-systems)/clsql-postgresql-socket.asd
+	dh_link -p $(pkg-aodbc) $(clc-aodbc)/clsql-aodbc.asd $(clc-systems)/clsql-aodbc.asd
 
 	# Test suite
 	dh_installdirs -p $(pkg) $(doc-dir)/html $(doc-dir)/test-suite
-- 
2.34.1