Update changelog for recent changes

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index a176f85d4fa8bc0d0c6bd1db09e50db10f2c48d7..2247697282d36de124efd5710d2a0141850973a4 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -37,7 +37,7 @@
                            (probe-file (make-pathname :directory dir
                                                       :name (component-name c)
                                                       :type library-file-type)))
-                       '((:absolute "usr" "lib" "clsql"))))) 
+                       '((:absolute "usr" "lib" "clsql")))))
     (list (if found
              found
              (make-pathname :name (component-name c)
@@ -50,11 +50,11 @@
 (defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
   (and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
                                (find-package '#:mysql)))
-       t)) 
+       t))
 
 (defmethod perform ((o compile-op) (c clsql-mysql-source-file))
   (unless (operation-done-p o c)
-    #-(or win32 mswindows)
+    #-(or win32 win64 windows mswindows)
     (unless (zerop (run-shell-command
                    #-freebsd "cd ~A; make"
                    #+freebsd "cd ~A; gmake"

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index e5a75f6a3c830ae72e2ad887faaa296d7283df54..ed556ee01e7bbdd350f7e032a63ab7105fc8f020 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -56,7 +56,7 @@
 
 (defmethod perform ((o compile-op) (c clsql-uffi-source-file))
   (unless (operation-done-p o c)
-    #-(or win32 mswindows)
+    #-(or win32 win64 windows mswindows)
     (unless (zerop (run-shell-command
                    #-(or freebsd netbsd) "cd ~A; make"
                    #+(or freebsd netbsd) "cd ~A; gmake"

diff --git a/clsql.asd b/clsql.asd
index 35e172ac40ef9440ed3037b4c60af5a4b589f638..0e1a302907af0770c3c8d6edc4153168bee99f6f 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -104,7 +104,7 @@ oriented interface."
                                       (namestring (user-homedir-pathname))
                                       ".clsql-init.lisp"))
                         (probe-file "/etc/clsql-init.lisp")
-                        #+(or mswin windows win32)
+                        #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))
 

diff --git a/db-mysql/clsql_mysql.c b/db-mysql/clsql_mysql.c
index 327f14e5553069225cfceca9aca17b880f035d11..2d3b1282cbd5d65b2255e92dadbbd31ee09d2248 100644 (file)
--- a/db-mysql/clsql_mysql.c
+++ b/db-mysql/clsql_mysql.c
@@ -15,7 +15,7 @@
  * (http://opensource.franz.com/preamble.html), also known as the LLGPL.
  ***************************************************************************/
 
-#ifdef WIN32
+#if defined(WIN32)||defined(WIN64)
 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason,

diff --git a/debian/changelog b/debian/changelog
index e22423cc2c61d83557671ca2d12157f87fdd59af..1353616f3bbed80fe279cc593348edfa4163f9de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-sql (4.0.5-1) unstable; urgency=low
+
+  * New upstream version
+  * Change build dependency to be independent of libmysqlclient version (closes:538459)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 26 Jul 2009 17:30:19 -0600
+
 cl-sql (4.0.4-1) unstable; urgency=low
 
   * Update Oracle FFI based on changes in CLSQL. Thanks to Paul

diff --git a/uffi/clsql_uffi.c b/uffi/clsql_uffi.c
index 0b840540ce8837950e21be48c9bea6454b37f88f..39754ff359488d01e4449e6bb3b1efb55f81bf71 100644 (file)
--- a/uffi/clsql_uffi.c
+++ b/uffi/clsql_uffi.c
@@ -15,7 +15,7 @@
  * (http://opensource.franz.com/preamble.html), also known as the LLGPL.
  ***************************************************************************/
 
-#ifdef WIN32
+#if defined(WIN32)||defined(WIN64)
 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason,
@@ -41,7 +41,7 @@ DLLEXPORT
 unsigned int
 atol64 (const unsigned char* str, unsigned int* pHigh32)
 {
-#ifdef WIN32
+#if defined(WIN32)||defined(WIN64)
   __int64 result = 0;
 #else
   long long result = 0;