r10579: Automated commit for Debian build of clsql upstream-version-3.1.17

diff --git a/ChangeLog b/ChangeLog
index 42b193d7b220b6977e6e7525cb06e27638fcbd99..288776d03df5b4d0de5466e7c98b2b94ff3b843a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 09 Jun 2005 Kevin Rosenberg <kevin@rosenberg.net>
-       * clsql-mysql.asd: Renamed uffi/mysql interface library from
-       mysql to uffi_mysql
-       * db-mysql/uffi_mysql.c: Renamed from mysql.c
-       * db-mysql/Makefile, db-mysql/mysql-loader.lisp: Rename shared library
+       * clsql-mysql.asd: Renamed clsql/mysql interface library from
+       mysql to clsql_mysql
+       * clsql-uffi.asd: Renamed clsql/uffi interface library from
+       mysql to clsql_uffi
+       * uffi/clsql_uffi.c: Renamed from uffi.c
+       * db-mysql/clsql_mysql.c: Renamed from mysql.c
+       * db-mysql/Makefile, db-mysql/Makefile.msvc, db-mysql/mysql-loader.lisp: Rename shared library
+       * uffi/Makefile, uffi/Makefile.msvc, uffi/uffi-loader.lisp: Rename shared library
        * db-*/*-loader.lisp: Commit big patch from Edi Weitz to remove
        absolute pathnames when searching for foreign libraries.
-       * uffi/clsql-uffi-loader: New file from Edi Weitz for support
        foreign library loading.
        
 07 Jun 2005 Kevin Rosenberg <kevin@rosenberg.net>

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 0ac546d23b7616eef3080d2d1c4d517b67b0e7dd..675a2ac32708ec84d68d1ce5648986cbcccaec85 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -64,7 +64,7 @@
       (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))
-  (or (and (probe-file #p"/usr/lib/clsql/clsql_mysql.so") t)
+  (or (and (probe-file #p"/usr/lib/clsql_mysql.so") t)
       (let ((lib (make-pathname :defaults (component-pathname c)
                                :type (uffi:default-foreign-library-type))))
        (and (probe-file lib) (probe-file (component-pathname c))

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index ad9f93f47c6ec0a314f9c2ba5f59a52469f534e8..d7d4ac61edbf67d38fdb3c21df25ec4e74d6809a 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -70,10 +70,10 @@
       (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
-  (or (and (probe-file #p"/usr/lib/clsql/uffi.so") t)
+  (or (and (probe-file #p"/usr/lib/clsql_uffi.so") t)
       (let ((lib (make-pathname :defaults (component-pathname c)
                                :type (uffi:default-foreign-library-type))))
-       (and (probe-file lib)
+       (and (probe-file lib) (probe-file (component-pathname c))
             (> (file-write-date lib) (file-write-date (component-pathname c)))))))
   
 (defsystem clsql-uffi

diff --git a/debian/rules b/debian/rules
index 49f81f78974ed9f9812cb6840d2c5ba18f780068..6604df99f8bd2c135e37331700cc3d11b80addf7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,10 @@ clc-sql             := $(clc-source)/clsql
 lispdir-sql    := $(clc-sql)/sql
 clc-uffi       := $(clc-source)/clsql-uffi
 lispdir-uffi   := $(clc-uffi)/uffi
-sodir-uffi     := usr/lib/clsql
+sodir-uffi     := usr/lib
 clc-mysql      := $(clc-source)/clsql-mysql
 lispdir-mysql  := $(clc-mysql)/db-mysql
-sodir-mysql    := usr/lib/clsql
+sodir-mysql    := usr/lib
 clc-pg         := $(clc-source)/clsql-postgresql
 lispdir-pg     := $(clc-pg)/db-postgresql
 clc-pg-socket  := $(clc-source)/clsql-postgresql-socket