r10593: Automated commit for Debian build of clsql upstream-version-3.2.0

diff --git a/ChangeLog b/ChangeLog
index 288776d03df5b4d0de5466e7c98b2b94ff3b843a..5cb42244b5fd92bdb7884756089be9785e5d3e2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 09 Jun 2005 Kevin Rosenberg <kevin@rosenberg.net>
 09 Jun 2005 Kevin Rosenberg <kevin@rosenberg.net>

+       * Version 3.2.0

        * clsql-mysql.asd: Renamed clsql/mysql interface library from
        mysql to clsql_mysql
        * clsql-uffi.asd: Renamed clsql/uffi interface library from
        * clsql-mysql.asd: Renamed clsql/mysql interface library from
        mysql to clsql_mysql
        * clsql-uffi.asd: Renamed clsql/uffi interface library from

diff --git a/debian/_patch_orig_ b/debian/_patch_orig_
index 32be4661929032760438904b6ce0a7043278d7e7..ee31c22aad73c22c26221ff3d2665aa89e385dff 100644 (file)
--- a/debian/_patch_orig_
+++ b/debian/_patch_orig_
@@ -1,24 +1,30 @@
 diff -ur clsql/db-mysql/mysql-loader.lisp clsql-debian/db-mysql/mysql-loader.lisp
 diff -ur clsql/db-mysql/mysql-loader.lisp clsql-debian/db-mysql/mysql-loader.lisp

---- clsql/db-mysql/mysql-loader.lisp   2005-06-08 13:21:08.816849000 -0600
-+++ clsql-debian/db-mysql/mysql-loader.lisp    2005-06-08 17:33:33.547500816 -0600
-@@ -41,9 +41,11 @@
-   *mysql-library-loaded*)
+--- clsql/db-mysql/mysql-loader.lisp   2005-06-08 18:23:40.000000000 -0600
++++ clsql-debian/db-mysql/mysql-loader.lisp    2005-06-08 18:17:29.000000000 -0600
+@@ -42,12 +42,14 @@

                                      
  (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
                                      
  (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))

--  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+   (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*

 -                                            :module "mysql" 
 -                                            :supporting-libraries *mysql-supporting-libraries*)
 -                                            :module "mysql" 
 -                                            :supporting-libraries *mysql-supporting-libraries*)

+-  (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+-                                            :module "clsql-mysql" 
+-                                            :supporting-libraries *mysql-supporting-libraries*)
+-  (setq *mysql-library-loaded* t))
++                                          :module "mysql" 
++                                          :supporting-libraries *mysql-supporting-libraries*)

 +  (if (probe-file #p"/usr/lib/clsql/clsql_mysql.so")
 +  (if (probe-file #p"/usr/lib/clsql/clsql_mysql.so")

-+      (uffi:load-foriegn-library #p"/usr/lib/clsql/clsql_mysql.so")
-+      (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
-+                                              :module "mysql" 
++      (uffi:load-foreign-library #p"/usr/lib/clsql/clsql_mysql.so")
++      (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
++                                              :module "clsql-mysql" 

 +                                              :supporting-libraries *mysql-supporting-libraries*))
 +                                              :supporting-libraries *mysql-supporting-libraries*))

-   (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
-                                             :module "clsql-mysql" 
-                                             :supporting-libraries *mysql-supporting-libraries*)
++      (setq *mysql-library-loaded* t))
+ 
+ 
+ (clsql-sys:database-type-load-foreign :mysql)

 diff -ur clsql/uffi/clsql-uffi-loader.lisp clsql-debian/uffi/clsql-uffi-loader.lisp
 diff -ur clsql/uffi/clsql-uffi-loader.lisp clsql-debian/uffi/clsql-uffi-loader.lisp

---- clsql/uffi/clsql-uffi-loader.lisp  2005-06-08 13:25:29.006295000 -0600
-+++ clsql-debian/uffi/clsql-uffi-loader.lisp   2005-06-08 17:34:29.748956896 -0600
+--- clsql/uffi/clsql-uffi-loader.lisp  2005-06-08 13:38:14.000000000 -0600
++++ clsql-debian/uffi/clsql-uffi-loader.lisp   2005-06-08 18:30:27.000000000 -0600

 @@ -51,10 +51,12 @@
    "T if foreign library was able to be loaded successfully")
  
 @@ -51,10 +51,12 @@
    "T if foreign library was able to be loaded successfully")
  


@@ -28,7 +34,7 @@ diff -ur clsql/uffi/clsql-uffi-loader.lisp clsql-debian/uffi/clsql-uffi-loader.l
 -                                 :supporting-libraries 
 -                                 *clsql-uffi-supporting-libraries*)
 +  (if (probe-file #p"/usr/lib/clsql/clsql_uffi.so")
 -                                 :supporting-libraries 
 -                                 *clsql-uffi-supporting-libraries*)
 +  (if (probe-file #p"/usr/lib/clsql/clsql_uffi.so")

-+      (uffi:load-foriegn-library #p"/usr/lib/clsql/clsql_uffi.so")
++      (uffi:load-foreign-library #p"/usr/lib/clsql/clsql_uffi.so")

 +      (find-and-load-foreign-library *clsql-uffi-library-filenames*
 +                                   :module "clsql-uffi" 
 +                                   :supporting-libraries 
 +      (find-and-load-foreign-library *clsql-uffi-library-filenames*
 +                                   :module "clsql-uffi" 
 +                                   :supporting-libraries 

diff --git a/debian/changelog b/debian/changelog
index 015d7a28fea897ae8a98bb82cc6e140c70febccc..d721149300319e97d860377490f0c2ac3d257bc5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-cl-sql (3.1.17-1) unstable; urgency=low
+cl-sql (3.2.0-1) unstable; urgency=low

 
   * New upstream
 
 
   * New upstream
 

- -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 08 Jun 2005 13:25:06 -0600
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed,  8 Jun 2005 18:34:07 -0600

 
 cl-sql (3.1.16-1) unstable; urgency=low
 
 
 cl-sql (3.1.16-1) unstable; urgency=low
 

diff --git a/uffi/make.sh b/uffi/make.sh
index 3a47327869ba6e214e440959b3a5a3c9b2c061d3..03e7478138b9ae12e37131e6894314cf6155fd4a 100644 (file)
--- a/uffi/make.sh
+++ b/uffi/make.sh
@@ -12,7 +12,7 @@ esac
     
 if [ "$os_linux" -o "$os_freebsd" ]; then
     gcc -fPIC -DPIC -c $SOURCE -o $OBJECT
     
 if [ "$os_linux" -o "$os_freebsd" ]; then
     gcc -fPIC -DPIC -c $SOURCE -o $OBJECT

-    ld -shared -soname=$BASE $OBJECT -o $SHARED_LIB
+    ld -shared -soname=$BASE $LDFLAGS $OBJECT -o $SHARED_LIB

 elif [ "$os_darwin" ]; then
     cc -dynamic -c $SOURCE -o $OBJECT
     ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $BASE.dylib $OBJECT
 elif [ "$os_darwin" ]; then
     cc -dynamic -c $SOURCE -o $OBJECT
     ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $BASE.dylib $OBJECT