r2272: *** empty log message ***

diff --git a/clsql-uffi/clsql-uffi-loader.cl b/clsql-uffi/clsql-uffi-loader.cl
index af633ba2f5344979996d1ec7ddc02eaab2acd5da..dabe5c9df019627c87d35f26d63c81e35426056e 100644 (file)
--- a/clsql-uffi/clsql-uffi-loader.cl
+++ b/clsql-uffi/clsql-uffi-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi-loader.cl,v 1.1 2002/08/01 03:06:27 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.2 2002/08/01 21:39:22 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -24,7 +24,7 @@
    "clsql-uffi"
    `(,(directory-namestring
        (translate-logical-pathname 
-       "cl-library:clsql;interfaces;clsql-uffi;"))
+       "cl-library:clsql-uffi;"))
      "/usr/lib/clsql/")
    :drive-letters '("C" "D" "E" "F" "G")))
 

diff --git a/debian/control b/debian/control
index 926b399b816ae5226b1d6baf6698dd9bb9672263..cbbc27d49c8b32e3cf9ae17590e76007a13177ce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,17 +15,26 @@ Description: SQL Interface for Common Lisp
 
 Package: cl-sql-base
 Architecture: any
-Depends: common-lisp-controller, cl-uffi, cmucl | lisp-compiler
+Depends: common-lisp-controller, cmucl | lisp-compiler
 Recommends: cl-sql-backend
 Description: SQL Interface for Common Lisp
  CLSQL uses the UFFI library to provide SQL to multiple SQL databases
  on multiple Common Lisp implementations.
+ .
+ This package provides the base framework for database backends.
+
+Package: cl-sql-uffi
+Architecture: any
+Depends: common-lisp-controller, cl-uffi, cmucl | lisp-compiler
+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.
 
 Package: cl-sql-mysql
 Architecture: any
-Depends: cl-sql-base (>= ${Source-Version}), libmysqlclient10
+Depends: cl-sql-base (>= ${Source-Version}), libmysqlclient10, cl-sql-uffi (>= ${Source-Version})
 Provides: cl-sql-backend
-Description: UncommonSQL database backend, MySQL
+Description: CLSQL database backend, MySQL
  This package enables you to use the CLSQL data access package
  with MySQL databases.
 
@@ -33,15 +42,15 @@ Package: cl-sql-aodbc
 Architecture: all
 Depends: cl-sql-base (>= ${Source-Version}), acl-installer
 Provides: cl-sql-backend
-Description: UncommonSQL database backend, AODBC
+Description: CLSQL database backend, AODBC
  This package enables you to use the CLSQL data access package
  with AllegroCL's AODBC databases.
 
 Package: cl-sql-postgresql
 Architecture: all
-Depends: cl-sql-base (>= ${Source-Version}), postgresql-client
+Depends: cl-sql-base (>= ${Source-Version}), postgresql-client, cl-sql-uffi (>= ${Source-Version})
 Provides: cl-sql-backend
-Description: UncommonSQL database backend, PostgreSQL
+Description: CLSQL database backend, PostgreSQL
  This package enables you to use the CLSQL data access package
  with PostgreSQL databases.
 
@@ -49,6 +58,6 @@ Package: cl-sql-postgresql-socket
 Architecture: all
 Depends: cl-sql-base (>= ${Source-Version})
 Provides: cl-sql-backend
-Description: UncommonSQL database backend, PostgreSQL
+Description: CLSQL database backend, PostgreSQL
  This package enables you to use the CLSQL data access package
  with PostgreSQL databases via a socket interface.

diff --git a/debian/rules b/debian/rules
index 37b62569bbe9d57fdef563cefee4316d4a51e599..ee8edd5623f7625a7a87743f1adf78497ffb764c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,12 @@ plain-pkg   := clsql
 
 pkg            := cl-sql
 pkg-base       := cl-sql-base
+pkg-uffi       := cl-sql-uffi
 pkg-mysql      := cl-sql-mysql
 pkg-pg         := cl-sql-postgresql
 pkg-pg-socket  := cl-sql-postgresql-socket
 pkg-aodbc      := cl-sql-aodbc
-all-pkgs       := $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
+all-pkgs       := $(pkg) $(pkg-base) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
 
 
 UPSTREAM_VER   := $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
@@ -81,7 +82,8 @@ install: build
        dh_installdirs --all  $(clc-systems) $(clc-source)
 
        dh_installdirs -p $(pkg) $(lispdir-sql)
-       dh_installdirs -p $(pkg-base) $(lispdir-base) $(lispdir-base-uffi) $(sodir-base-uffi)
+       dh_installdirs -p $(pkg-base) $(lispdir-base)
+       dh_installdirs -p $(pkg-uffi) $(lispdir-base-uffi) $(sodir-base-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)
@@ -92,9 +94,12 @@ install: build
 
        # Base
        dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
-       dh_install -p $(pkg-base) $(srcs-base-uffi) $(lispdir-base-uffi)
-       dh_install -p $(pkg-base) $(srcs-base-uffi-so) $(sodir-base-uffi)
 
+       # UFFI
+       dh_install -p $(pkg-uffi) $(srcs-base-uffi) $(lispdir-base-uffi)
+       dh_install -p $(pkg-uffi) $(srcs-base-uffi-so) $(sodir-base-uffi)
+
+       # Backends
        dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
        dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
        dh_install -p $(pkg-pg) $(srcs-pg) $(lispdir-pg)
@@ -103,7 +108,8 @@ install: build
 
        # CLC Systems
        dh_install -p $(pkg) clsql.system $(clc-systems)
-       dh_install -p $(pkg-base) clsql-base.system clsql-uffi.system $(clc-systems)
+       dh_install -p $(pkg-base) clsql-base.system $(clc-systems)
+       dh_install -p $(pkg-uffi) clsql-uffi.system $(clc-systems)
        dh_install -p $(pkg-mysql) clsql-mysql.system $(clc-systems)
        dh_install -p $(pkg-pg) clsql-postgresql.system $(clc-systems)
        dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.system $(clc-systems)