From f8a2aab1c18bd495299ea3c542bc1b6daac52db2 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 15 May 2002 17:21:29 +0000
Subject: [PATCH] r2050: Debian build

---
 base/package.cl        | 4 ++--
 {sql => base}/utils.cl | 2 +-
 clsql-base.system      | 3 ++-
 clsql.system           | 3 +--
 debian/rules           | 2 --
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename {sql => base}/utils.cl (96%)

diff --git a/base/package.cl b/base/package.cl
index 2016b38..30fc9a5 100644
--- a/base/package.cl
+++ b/base/package.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: package.cl,v 1.2 2002/05/13 17:20:35 marc.battyani Exp $
+;;;; $Id: package.cl,v 1.3 2002/05/15 17:21:29 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -120,7 +120,7 @@
 	 ;; utils.cl
 	 #:number-to-sql-string
 	 #:float-to-sql-string
-	 #:sql-escape-quotes
+	 #:sql-escape
 
 	 ;; For UncommonSQL support
 	 #:sql-ident
diff --git a/sql/utils.cl b/base/utils.cl
similarity index 96%
rename from sql/utils.cl
rename to base/utils.cl
index aa0aa33..a33fb41 100644
--- a/sql/utils.cl
+++ b/base/utils.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:   Kevin M. Rosenberg
 ;;;; Date Started: Mar 2002
 ;;;;
-;;;; $Id: utils.cl,v 1.2 2002/03/27 05:04:19 kevin Exp $
+;;;; $Id: utils.cl,v 1.1 2002/05/15 17:19:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-base.system b/clsql-base.system
index 51b0c58..b22e34f 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.5 2002/05/15 17:10:28 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.6 2002/05/15 17:19:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -33,6 +33,7 @@
     :binary-pathname "CL-LIBRARY:clsql;base;bin;"
     :components ((:file "cmucl-compat")
 		 (:file "package")
+		 (:file "utils" :depends-on ("package"))
 		 (:file "classes" :depends-on ("package"))
 		 (:file "conditions" :depends-on ("classes"))
 		 (:file "db-interface" :depends-on ("conditions"))
diff --git a/clsql.system b/clsql.system
index aa63476..aa1356e 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.13 2002/05/15 17:10:28 kevin Exp $
+;;;; $Id: clsql.system,v 1.14 2002/05/15 17:19:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -35,7 +35,6 @@
 		 (:file "loop-extension")
 		 (:file "sql" :depends-on ("pool"))
 		 (:file "transactions" :depends-on ("sql"))
-		 (:file "utils")
 		 (:file "functional" :depends-on ("sql"))
 		 (:file "usql" :depends-on ("sql")))
     :depends-on (:clsql-base)
diff --git a/debian/rules b/debian/rules
index 4f5cb8d..136cddb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ prefix-aodbc	:= debian/$(pkg-aodbc)
 
 ## Lisp sources
 srcs		:= $(wildcard sql/*.cl)
-srcs-cmucl-compat:= $(wildcard cmucl-compat/*.cl)
 srcs-base	:= $(wildcard base/*.cl)
 srcs-base-uffi	:= $(wildcard interfaces/clsql-uffi/*.cl) 
 srcs-base-uffi-so:= $(wildcard interfaces/clsql-uffi/*.so)
@@ -78,7 +77,6 @@ install: build
 
 	# Main package
 	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
 
 	# Base
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/base
-- 
2.34.1