From ff1f136e9e966a5dace14a1af628cab14f898808 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 6 Sep 2002 11:00:49 +0000
Subject: [PATCH] r2572: Auto commit for Debian build

---
 clsql-aodbc.asd                | 12 +++++++-----
 clsql-aodbc.system             |  7 +++++--
 clsql-base.asd                 | 11 ++++-------
 clsql-base.system              | 12 ++++--------
 clsql-mysql.asd                | 16 +++++++++-------
 clsql-mysql.system             |  6 ++++--
 clsql-oracle.asd               | 27 ++++++++++++++-------------
 clsql-oracle.system            |  6 ++++--
 clsql-postgresql-socket.asd    | 18 ++++++++++--------
 clsql-postgresql-socket.system |  6 ++++--
 clsql-postgresql.asd           | 18 ++++++++++--------
 clsql-postgresql.system        |  6 ++++--
 clsql-uffi.asd                 |  6 ++++--
 clsql-uffi.system              |  6 ++++--
 clsql.system                   |  6 ++++--
 15 files changed, 91 insertions(+), 72 deletions(-)

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index f981046..7b04627 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.4 2002/09/06 10:26:17 kevin Exp $
+;;;; $Id: clsql-aodbc.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,10 +20,12 @@
 (in-package :asdf)
 
 (defsystem clsql-aodbc
-  :pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
-  :components ((:file "aodbc-package")
-	       (:file "aodbc-sql" :depends-on ("aodbc-package")))
-  :depends-on (:clsql-base))
+    :pathname #.(format nil "~A:clsql-aodbc;"
+			#+common-lisp-controller "cl-library"
+			#-common-lisp-controller "clsql")
+    :components ((:file "aodbc-package")
+		 (:file "aodbc-sql" :depends-on ("aodbc-package")))
+    :depends-on (:clsql-base))
 
     
 (defmethod source-file-type  ((c cl-source-file)
diff --git a/clsql-aodbc.system b/clsql-aodbc.system
index 00d8f98..315ea62 100644
--- a/clsql-aodbc.system
+++ b/clsql-aodbc.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-aodbc.system,v 1.10 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-aodbc.system,v 1.11 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,7 +20,10 @@
 (in-package :make)
 
 (defsystem :clsql-aodbc
-  :source-pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-aodbc;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
+
   :source-extension "cl"
   :components ((:file "aodbc-package")
 	       (:file "aodbc-sql" :depends-on ("aodbc-package")))
diff --git a/clsql-base.asd b/clsql-base.asd
index e304a0f..84d3a66 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.7 2002/09/06 10:31:51 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.8 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -31,16 +31,13 @@
 		    :device (pathname-device *load-truename*)
 		    :directory (pathname-directory *load-truename*)))))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defconstant +clsql-logical-host+
-      #+common-lisp-controller "cl-library"
-      #-common-lisp-controller "clsql"
-      "Logical hostname for loading system"))
 
  ;;; System definitions
 
 (defsystem clsql-base
-  :pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
+    :pathname #.(format nil "~A:clsql-base;" 
+      #+common-lisp-controller "cl-library"
+      #-common-lisp-controller "clsql")
   :perform (load-op :after (op clsql-base)
 		    (pushnew :clsql-base cl:*features*))
   :components ((:file "cmucl-compat")
diff --git a/clsql-base.system b/clsql-base.system
index c6b28b5..fd8e4d2 100644
--- a/clsql-base.system
+++ b/clsql-base.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.system,v 1.11 2002/09/06 10:31:51 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.12 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -31,16 +31,12 @@
 		    :device (pathname-device *load-truename*)
 		    :directory (pathname-directory *load-truename*)))))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defconstant +clsql-logical-host+
-      #+common-lisp-controller "cl-library"
-      #-common-lisp-controller "clsql"
-      "Logical hostname for loading system"))
-
 ;;; System definitions
 
 (defsystem :clsql-base
-  :source-pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-base;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components ((:file "cmucl-compat")
 	       (:file "package")
diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 44789a6..9e17055 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.4 2002/09/06 10:26:17 kevin Exp $
+;;;; $Id: clsql-mysql.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,13 +23,15 @@
 ;;; System definition
 
 (defsystem clsql-mysql
-  :pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)
-  :components ((:file "mysql-package")
-	       (:file "mysql-loader" :depends-on ("mysql-package"))
-	       (:file "mysql-api" :depends-on ("mysql-loader"))
-	       (:file "mysql-sql" :depends-on ("mysql-api"))
+    :pathname #.(format nil "~A:clsql-mysql;"
+			#+common-lisp-controller "cl-library"
+			#-common-lisp-controller "clsql")
+    :components ((:file "mysql-package")
+		 (:file "mysql-loader" :depends-on ("mysql-package"))
+		 (:file "mysql-api" :depends-on ("mysql-loader"))
+		 (:file "mysql-sql" :depends-on ("mysql-api"))
 		 (:file "mysql-usql" :depends-on ("mysql-sql")))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
+    :depends-on (:uffi :clsql-base :clsql-uffi))
 
 
 (defmethod source-file-type  ((c cl-source-file)
diff --git a/clsql-mysql.system b/clsql-mysql.system
index fd2910e..5bea359 100644
--- a/clsql-mysql.system
+++ b/clsql-mysql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-mysql.system,v 1.17 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-mysql.system,v 1.18 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,9 @@
 ;;; System definition
 
 (defsystem :clsql-mysql
-  :source-pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-mysql;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components ((:file "mysql-package")
 	       (:file "mysql-loader" :depends-on ("mysql-package"))
diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 5d75466..b694792 100644
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -1,25 +1,26 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.asd,v 1.4 2002/09/06 10:26:17 kevin Exp $
+;;;; $Id: clsql-oracle.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
 
 (in-package :asdf)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-  :pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
-  :pathname "cl-library:clsql-oracle"
-  :components
-  ((:file "oracle-package")
-   (:file "oracle-loader" :depends-on ("oracle-package"))
-   (:file "alien-resources" :depends-on ("oracle-package"))
-   (:file "oracle-constants" :depends-on ("oracle-package"))
-   (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
-   (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
-   (:file "oracle-objects" :depends-on ("oracle-sql")))
-  :depends-on (:clsql-base))
-
+    :pathname #.(format nil "~A:clsql-oracle;"
+			#+common-lisp-controller "cl-library"
+			#-common-lisp-controller "clsql")
+    :pathname "cl-library:clsql-oracle"
+    :components
+    ((:file "oracle-package")
+     (:file "oracle-loader" :depends-on ("oracle-package"))
+     (:file "alien-resources" :depends-on ("oracle-package"))
+     (:file "oracle-constants" :depends-on ("oracle-package"))
+     (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
+     (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
+     (:file "oracle-objects" :depends-on ("oracle-sql")))
+    :depends-on (:clsql-base))
 
 
 (defmethod source-file-type  ((c cl-source-file)
diff --git a/clsql-oracle.system b/clsql-oracle.system
index 78a9ce4..c52957f 100644
--- a/clsql-oracle.system
+++ b/clsql-oracle.system
@@ -1,14 +1,16 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.system,v 1.4 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-oracle.system,v 1.5 2002/09/06 10:56:13 kevin Exp $
 
 (in-package :make)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-  :source-pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-oracle;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components
   ((:file "oracle-package")
diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index ca43518..74b631f 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.4 2002/09/06 10:26:17 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,13 +22,15 @@
 ;;; System definition
 
 (defsystem clsql-postgresql-socket
-  :pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)
-  :components ((:file "postgresql-socket-package")
-	       (:file "postgresql-socket-api"
-		      :depends-on ("postgresql-socket-package"))
-	       (:file "postgresql-socket-sql"
-		      :depends-on ("postgresql-socket-api")))
-  :depends-on (:clsql-base :uffi))
+    :pathname #.(format nil "~A:clsql-postgresql-socket;"
+			#+common-lisp-controller "cl-library"
+			#-common-lisp-controller "clsql")
+    :components ((:file "postgresql-socket-package")
+		 (:file "postgresql-socket-api"
+			:depends-on ("postgresql-socket-package"))
+		 (:file "postgresql-socket-sql"
+			:depends-on ("postgresql-socket-api")))
+    :depends-on (:clsql-base :uffi))
 
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-postgresql-socket)))) 
diff --git a/clsql-postgresql-socket.system b/clsql-postgresql-socket.system
index 8c145f6..e4ee7b0 100644
--- a/clsql-postgresql-socket.system
+++ b/clsql-postgresql-socket.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.system,v 1.11 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.system,v 1.12 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,7 +22,9 @@
 ;;; System definition
 
 (defsystem :clsql-postgresql-socket
-  :source-pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-postgresql-socket;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components ((:file "postgresql-socket-package")
 	       (:file "postgresql-socket-api"
diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 21f6725..46b26e6 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.4 2002/09/06 10:26:17 kevin Exp $
+;;;; $Id: clsql-postgresql.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,13 +20,15 @@
 (in-package :asdf)
 
 (defsystem clsql-postgresql
-  :pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)
-  :components ((:file "postgresql-package")
-	       (:file "postgresql-loader" :depends-on ("postgresql-package"))
-	       (:file "postgresql-api" :depends-on ("postgresql-loader"))
-	       (:file "postgresql-sql" :depends-on ("postgresql-api"))
-	       (:file "postgresql-usql" :depends-on ("postgresql-sql")))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
+    :pathname #.(format nil "~A:clsql-postgresql;"
+			#+common-lisp-controller "cl-library"
+			#-common-lisp-controller "clsql")
+    :components ((:file "postgresql-package")
+		 (:file "postgresql-loader" :depends-on ("postgresql-package"))
+		 (:file "postgresql-api" :depends-on ("postgresql-loader"))
+		 (:file "postgresql-sql" :depends-on ("postgresql-api"))
+		 (:file "postgresql-usql" :depends-on ("postgresql-sql")))
+    :depends-on (:uffi :clsql-base :clsql-uffi))
 
 
 (defmethod source-file-type  ((c cl-source-file)
diff --git a/clsql-postgresql.system b/clsql-postgresql.system
index cbf5629..5d4ecea 100644
--- a/clsql-postgresql.system
+++ b/clsql-postgresql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql.system,v 1.11 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-postgresql.system,v 1.12 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,7 +20,9 @@
 (in-package :make)
 
 (defsystem :clsql-postgresql
-  :source-pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-postgresql;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components ((:file "postgresql-package")
 	       (:file "postgresql-loader" :depends-on ("postgresql-package"))
diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 74d49ac..8ecdc35 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.6 2002/09/06 10:45:52 kevin Exp $
+;;;; $Id: clsql-uffi.asd,v 1.7 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,9 @@
 ;;; System definition
 
 (defsystem clsql-uffi
-  :pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
+  :pathname #.(format nil "~A:clsql-uffi;"
+      #+common-lisp-controller "cl-library"
+      #-common-lisp-controller "clsql")
   :components ((:file "clsql-uffi-package")
 	       (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
 	       (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
diff --git a/clsql-uffi.system b/clsql-uffi.system
index 1a16302..cb820b8 100644
--- a/clsql-uffi.system
+++ b/clsql-uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-uffi.system,v 1.8 2002/09/06 10:45:52 kevin Exp $
+;;;; $Id: clsql-uffi.system,v 1.9 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,9 @@
 ;;; System definition
 
 (defsystem :clsql-uffi
-  :source-pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql-uffi;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components ((:file "clsql-uffi-package")
 	       (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
diff --git a/clsql.system b/clsql.system
index 055927d..ef655b8 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.19 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql.system,v 1.20 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,7 +28,9 @@
 ;;; System definitions
 
 (defsystem :clsql
-  :source-pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
+  :source-pathname #.(format nil "~A:clsql;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "clsql")
   :source-extension "cl"
   :components ((:file "package")
 	       (:file "pool" :depends-on ("package"))
-- 
2.34.1