X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2F_patch_orig_;fp=debian%2F_patch_orig_;h=0000000000000000000000000000000000000000;hb=18e34efea688a6758b6e997401fbc3f241da98f3;hp=ee31c22aad73c22c26221ff3d2665aa89e385dff;hpb=055827b45d885b8d57a04992598b03ffa8d87ba5;p=clsql.git diff --git a/debian/_patch_orig_ b/debian/_patch_orig_ deleted file mode 100644 index ee31c22..0000000 --- a/debian/_patch_orig_ +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur clsql/db-mysql/mysql-loader.lisp clsql-debian/db-mysql/mysql-loader.lisp ---- 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))) - (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names* -- :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") -+ (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*)) -+ (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 ---- 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") - - (defun load-uffi-foreign-library () -- (find-and-load-foreign-library *clsql-uffi-library-filenames* -- :module "clsql-uffi" -- :supporting-libraries -- *clsql-uffi-supporting-libraries*) -+ (if (probe-file #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 -+ *clsql-uffi-supporting-libraries*)) - (setq *uffi-library-loaded* t)) - - (load-uffi-foreign-library)