Automated commit for debian release 6.7.2-1

diff --git a/COPYING.CLSQL b/COPYING.CLSQL
deleted file mode 100644 (file)
index d8bdee7..0000000
--- a/COPYING.CLSQL
+++ /dev/null
@@ -1,18 +0,0 @@
-CLSQL is written and Copyright (c) 2002-2009 by Kevin M. Rosenberg and is
-based on the MaiSQL package written and Copyright (c) 1999-2001 by
-Pierre R. Mai. In addition, CLSQL contains code from the UncommonSQL
-project Copyright (C) 1999-2003 by onShore Development, Inc and code
-from SQL/ODBC Copyright (C) 1999-2001 by Paul Meurer.
-
-CLSQL is licensed under the terms of the Lisp Lesser GNU
-Public License (http://opensource.franz.com/preamble.html), known as
-the LLGPL.  The LLGPL consists of a preamble (see above URL) and the
-LGPL.  Where these conflict, the preamble takes precedence. 
-CLSQL is referenced in the preamble as the "LIBRARY."
-
-CLSQL is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-
-

diff --git a/COPYING.MaiSQL b/COPYING.MaiSQL
deleted file mode 100644 (file)
index 88c5806..0000000
--- a/COPYING.MaiSQL
+++ /dev/null
@@ -1,25 +0,0 @@
-  Copyright (C) 1999-2001 Pierre R. Mai
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-  Except as contained in this notice, the name of the author shall
-  not be used in advertising or otherwise to promote the sale, use or
-  other dealings in this Software without prior written authorization
-  from the author.

diff --git a/COPYING.SQL-ODBC b/COPYING.SQL-ODBC
deleted file mode 100644 (file)
index b77a944..0000000
--- a/COPYING.SQL-ODBC
+++ /dev/null
@@ -1,21 +0,0 @@
-;;; SQL/ODBC module for MCL, CMUCL, LispWorks, ACL and CormanLisp
-;;; Version 0.9
-;;; Copyright (C) Paul Meurer 1999-2001 All rights reserved.
-;;; paul.meurer@hit.uib.no
-;;;
-;;; Use and copying of this software and preparation of derivative works
-;;; based upon this software are permitted, so long as the following
-;;; conditions are met:
-;;;      o This copyright notice is included intact.
-;;;      o No fees or compensation are charged for use, copies, or
-;;;       access to this software. You may charge a nominal
-;;;       distribution fee for the physical act of transferring a
-;;;       copy, but you may not charge for the program itself. 
-;;;      o You are allowed to use this software as part of a commercial
-;;;        software package, provided that its functionality significantly 
-;;;        exceeds the functionality of this software, and that the use of 
-;;;        this software is explicitly mentioned in your documentation.
-;;;
-;;; This software is made available AS IS, and no warranty is made about 
-;;; the software or its performance. 
-

diff --git a/COPYING.USQL b/COPYING.USQL
deleted file mode 100644 (file)
index e27518e..0000000
--- a/COPYING.USQL
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 1999 - 2003 onShore Development, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/ChangeLog b/ChangeLog
index 8827550d1b05b85e99473370d5d846622da0367f..a66a94a0c7f3aeaed6d08da695cdafa5d2beb5cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-28 Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 6.7.2 release
+       * LICENSE: After consulting with the contributors to CLSQL,
+       CLSQL is now relicensed under MIT license
+

 2016-01-26 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 6.7.0 release
        * sql/utils.lisp: Apply patch from Martin Simmons for
 2016-01-26 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 6.7.0 release
        * sql/utils.lisp: Apply patch from Martin Simmons for

diff --git a/clsql.asd b/clsql.asd
index 4f009505eed9ef3e3603214f2133f2ea5af69340..37263ce37d284a48dc0b5fb9795e1d8ea114aa87 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -94,12 +94,8 @@ oriented interface."
                                     (:file "generic-odbc")
                                     (:file "sequences")
                                     (:file "command-object"))
                                     (:file "generic-odbc")
                                     (:file "sequences")
                                     (:file "command-object"))

-                       :depends-on (functional))))))
-
-
-(defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
-  (operate 'load-op 'clsql-tests)
-  (operate 'test-op 'clsql-tests :force t))
+                       :depends-on (functional)))))
+    :in-order-to ((test-op (test-op "clsql-tests"))))

 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
   (let* ((init-var (uffi::getenv "CLSQLINIT"))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
   (let* ((init-var (uffi::getenv "CLSQLINIT"))


@@ -112,4 +108,3 @@ oriented interface."
                         #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))
                         #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))

-

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index cf7c71d45acca342dbf693856d55e08d8d2a55a4..fed4bccaf199443bdc3d3c8144f421af26ce0064 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -66,9 +66,9 @@ else
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
            gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib)
            rm $(object)
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
            gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib)
            rm $(object)

-           @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
-           -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
-           -gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS32) -o $(shared_lib)
+           #@echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
+           #-gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
+           #-gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS32) -o $(shared_lib)

           else
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
            gcc -fPIC -shared -Wl,-soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)
           else
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
            gcc -fPIC -shared -Wl,-soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)

diff --git a/db-mysql/clsql_mysql.dll b/db-mysql/clsql_mysql.dll
deleted file mode 100644 (file)
index 095c091..0000000
Binary files a/db-mysql/clsql_mysql.dll and /dev/null differ

diff --git a/db-mysql/mysql-client-info.lisp b/db-mysql/mysql-client-info.lisp
index 9b791df2302962c26be50f2035cf0de2a747f8be..a944d452896a9408730053aa9f359fe3b05c6f55 100644 (file)
--- a/db-mysql/mysql-client-info.lisp
+++ b/db-mysql/mysql-client-info.lisp
@@ -47,5 +47,4 @@
       ((eql (schar *mysql-client-info* 0) #\6)
        (pushnew :mysql-client-v6 cl:*features*))
       (t
       ((eql (schar *mysql-client-info* 0) #\6)
        (pushnew :mysql-client-v6 cl:*features*))
       (t

-       (error "Unknown mysql client version '~A'." *mysql-client-info*)))))
-
+       (format t "Warning: Unknown mysql client version '~A', verify proper operation." *mysql-client-info*)))))

diff --git a/debian/changelog b/debian/changelog
index 62869f7c342db361adaba0c771701ab4d3c823c5..2e9469e854208c0cb399ed086fca7fc9d11b56eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+cl-sql (6.7.2-1) unstable; urgency=medium
+
+  * LICENSE: CLSQL is now licensed under MIT license
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 29 Oct 2022 04:30:27 +0000
+
+cl-sql (6.7.1-3) unstable; urgency=medium
+
+  * Remove cl-sql-sqlite from cl-sql-tests dependencies (closes: 973358)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 29 Oct 2020 17:35:49 +0000
+
+cl-sql (6.7.1-2) unstable; urgency=medium
+
+  * Remove cl-sql-sqlite binary package (closes: 972124)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 13 Oct 2020 02:51:11 +0000
+
+cl-sql (6.7.1-1) unstable; urgency=medium
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 01 Oct 2020 16:39:41 +0000
+
+cl-sql (6.7.0.1-2) unstable; urgency=medium
+
+  * Source only package upload (closes: 970609)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 28 Sep 2020 20:42:03 +0000
+
+cl-sql (6.7.0.1-1) unstable; urgency=medium
+
+  * Clean source file package
+  * Update Debian compatibility
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 20 Jul 2020 19:53:44 +0000
+
+cl-sql (6.7.0-1) unstable; urgency=medium
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 26 Jan 2016 14:40:50 -0700
+

 cl-sql (6.6.3-3) unstable; urgency=medium
 
   * debian/rules: Separate install target to install-indep and
 cl-sql (6.6.3-3) unstable; urgency=medium
 
   * debian/rules: Separate install target to install-indep and

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..b4de3947675361a7770d29b8982c407b0ec6b2a0 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+11

diff --git a/debian/control b/debian/control
index ca4c4df79ae7ab4df6e954c6c337433877e34f2c..d859168a22bd2d824484e2169a92ce8fef0e5067 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: cl-sql
 Section: lisp
 Source: cl-sql
 Section: lisp

-Priority: extra
+Priority: optional

 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>

-Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
-Standards-Version: 3.9.5.0
+Build-Depends: dh-lisp, debhelper (>= 11.0.0), default-libmysqlclient-dev, libpq-dev
+Standards-Version: 4.6.1.1

 Homepage: http://clsql.kpe.io/
 Vcs-Git: git://git.kpe.io/clsql.git
 Vcs-Browser: http://git.kpe.io/?p=clsql.git
 Homepage: http://clsql.kpe.io/
 Vcs-Git: git://git.kpe.io/clsql.git
 Vcs-Browser: http://git.kpe.io/?p=clsql.git


@@ -28,7 +28,7 @@ Description: Common UFFI functions for CLSQL database backends
 
 Package: cl-sql-mysql
 Architecture: any
 
 Package: cl-sql-mysql
 Architecture: any

-Depends: cl-sql (= ${source:Version}), cl-sql-uffi (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libmysqlclient-dev
+Depends: cl-sql (= ${source:Version}), cl-sql-uffi (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, default-libmysqlclient-dev

 Provides: cl-sql-backend
 Description: CLSQL database backend, MySQL
  This package enables you to use the CLSQL data access package
 Provides: cl-sql-backend
 Description: CLSQL database backend, MySQL
  This package enables you to use the CLSQL data access package


@@ -74,15 +74,6 @@ Description: CLSQL database backend, PostgreSQL via sockets
  server.
  CLSQL is a Common Lisp interface to SQL databases.
 
  server.
  CLSQL is a Common Lisp interface to SQL databases.
 

-Package: cl-sql-sqlite
-Architecture: all
-Depends: cl-sql (= ${source:Version}), libsqlite0-dev, cl-sql-uffi (>= ${source:Version}), ${misc:Depends}
-Provides: cl-sql-backend
-Description: CLSQL database backend, SQLite
- This package enables you to use the CLSQL data access package
- with SQLite databases. 
- CLSQL is a Common Lisp interface to SQL databases.
-

 Package: cl-sql-sqlite3
 Architecture: all
 Depends: cl-sql (= ${source:Version}), libsqlite3-dev, cl-sql-uffi (>= ${source:Version}), ${misc:Depends}
 Package: cl-sql-sqlite3
 Architecture: all
 Depends: cl-sql (= ${source:Version}), libsqlite3-dev, cl-sql-uffi (>= ${source:Version}), ${misc:Depends}


@@ -104,7 +95,7 @@ Description: CLSQL database backend, Oracle
 
 Package: cl-sql-tests
 Architecture: all
 
 Package: cl-sql-tests
 Architecture: all

-Depends: cl-sql, cl-sql-postgresql, cl-sql-postgresql-socket, cl-sql-mysql, cl-sql-sqlite, cl-sql-odbc, cl-rt, ${misc:Depends}
+Depends: cl-sql, cl-sql-postgresql, cl-sql-postgresql-socket, cl-sql-mysql, cl-sql-sqlite3, cl-sql-odbc, cl-rt, ${misc:Depends}

 Suggests: acl-installer, libmyodbc, unixodbc,cl-sql-aodbc 
 Description: Testing suite for CLSQL
  This package contains a test suite for CLSQL. It requires manual
 Suggests: acl-installer, libmyodbc, unixodbc,cl-sql-aodbc 
 Description: Testing suite for CLSQL
  This package contains a test suite for CLSQL. It requires manual

diff --git a/debian/copyright b/debian/copyright
index 71a7cb7dd16fda600f327f0f716ca5149b1166f0..f571eac20897151c132f2842e1706b9a7dab4958 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,81 +8,27 @@ Debian Maintainer: (Same as upstream)
 
 Upstream Copyright Statement
 ============================
 
 Upstream Copyright Statement
 ============================

-CLSQL is written and Copyright (c) 2002 by Kevin M. Rosenberg.
-
-CLSQL is licensed under the terms of the Lisp Lesser GNU General
-Public License, known as the LLGPL.  The LLGPL consists of a preamble
-(see below) and the Lessor GNU General Public License 2.1 (LGPL-2.1).
-Where these conflict, the preamble takes precedence.  CLSQL is
-referenced in the preamble as the "LIBRARY."  The LGPL-2.1 is stored
-on a Debian system in the file /usr/share/common-licenses/LGPL-2.1.
-
-CLSQL is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-
-
-Preamble to the Gnu Lesser General Public License
--------------------------------------------------
-Copyright (c) 2000 Franz Incorporated, Berkeley, CA 94704
-
-The concept of the GNU Lesser General Public License version 2.1
-("LGPL") has been adopted to govern the use and distribution of
-above-mentioned application. However, the LGPL uses terminology that
-is more appropriate for a program written in C than one written in
-Lisp. Nevertheless, the LGPL can still be applied to a Lisp program if
-certain clarifications are made. This document details those
-clarifications. Accordingly, the license for the open-source Lisp
-applications consists of this document plus the LGPL. Wherever there
-is a conflict between this document and the LGPL, this document takes
-precedence over the LGPL.
-
-A "Library" in Lisp is a collection of Lisp functions, data and
-foreign modules. The form of the Library can be Lisp source code (for
-processing by an interpreter) or object code (usually the result of
-compilation of source code or built with some other
-mechanisms). Foreign modules are object code in a form that can be
-linked into a Lisp executable. When we speak of functions we do so in
-the most general way to include, in addition, methods and unnamed
-functions. Lisp "data" is also a general term that includes the data
-structures resulting from defining Lisp classes. A Lisp application
-may include the same set of Lisp objects as does a Library, but this
-does not mean that the application is necessarily a "work based on the
-Library" it contains.
-
-The Library consists of everything in the distribution file set before
-any modifications are made to the files. If any of the functions or
-classes in the Library are redefined in other files, then those
-redefinitions ARE considered a work based on the Library. If
-additional methods are added to generic functions in the Library,
-those additional methods are NOT considered a work based on the
-Library. If Library classes are subclassed, these subclasses are NOT
-considered a work based on the Library. If the Library is modified to
-explicitly call other functions that are neither part of Lisp itself
-nor an available add-on module to Lisp, then the functions called by
-the modified Library ARE considered a work based on the Library. The
-goal is to ensure that the Library will compile and run without
-getting undefined function errors.
-
-It is permitted to add proprietary source code to the Library, but it
-must be done in a way such that the Library will still run without
-that proprietary code present. Section 5 of the LGPL distinguishes
-between the case of a library being dynamically linked at runtime and
-one being statically linked at build time. Section 5 of the LGPL
-states that the former results in an executable that is a "work that
-uses the Library." Section 5 of the LGPL states that the latter
-results in one that is a "derivative of the Library", which is
-therefore covered by the LGPL. Since Lisp only offers one choice,
-which is to link the Library into an executable at build time, we
-declare that, for the purpose applying the LGPL to the Library, an
-executable that results from linking a "work that uses the Library"
-with the Library is considered a "work that uses the Library" and is
-therefore NOT covered by the LGPL.
-
-Because of this declaration, section 6 of LGPL is not applicable to
-the Library. However, in connection with each distribution of this
-executable, you must also deliver, in accordance with the terms and
-conditions of the LGPL, the source code of Library (or your derivative
-thereof) that is incorporated into this executable.

 
 

+Copyright (C) 2002-2022 by Kevin M. Rosenberg <kevin@rosenberg.net>
+Copyright (C) 1999-2001 Pierre R. Mai (MaiSQL <paul.meurer@hit.uib.no>)
+Copyright (C) 1999-2020 onShore Development (UncommonSQL)
+Copyright (C) 1999-2001 Paul Meurer (SQL/ODBC)
+Copyright (C) 2010-2015 Marc Battyani <marc@battyani.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

diff --git a/debian/rules b/debian/rules
index 58529cb9cafaf587d6dde30f4a2d6b476e0001e8..8db784f3799f9e4f023573f32f72fef2a398494f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,10 @@ pkg-pg                := cl-sql-postgresql
 pkg-pg-socket  := cl-sql-postgresql-socket
 pkg-aodbc      := cl-sql-aodbc
 pkg-odbc       := cl-sql-odbc
 pkg-pg-socket  := cl-sql-postgresql-socket
 pkg-aodbc      := cl-sql-aodbc
 pkg-odbc       := cl-sql-odbc

-pkg-sqlite     := cl-sql-sqlite

 pkg-sqlite3    := cl-sql-sqlite3
 pkg-oracle     := cl-sql-oracle
 pkg-tests      := cl-sql-tests
 pkg-sqlite3    := cl-sql-sqlite3
 pkg-oracle     := cl-sql-oracle
 pkg-tests      := cl-sql-tests

-all-pkgs       := $(pkg) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc) $(pkg-odbc) $(pkg-sqlite) $(pkg-sqlite3) $(pkg-tests)
+all-pkgs       := $(pkg) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc) $(pkg-odbc) $(pkg-sqlite3) $(pkg-tests)

 
 
 UPSTREAM_VER   := $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
 
 
 UPSTREAM_VER   := $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)


@@ -28,7 +27,6 @@ srcs-pg               := $(wildcard db-postgresql/*.lisp)
 srcs-pg-socket := $(wildcard db-postgresql-socket/*.lisp)
 srcs-aodbc     := $(wildcard db-aodbc/*.lisp)
 srcs-odbc      := $(wildcard db-odbc/*.lisp)
 srcs-pg-socket := $(wildcard db-postgresql-socket/*.lisp)
 srcs-aodbc     := $(wildcard db-aodbc/*.lisp)
 srcs-odbc      := $(wildcard db-odbc/*.lisp)

-srcs-sqlite    := $(wildcard db-sqlite/*.lisp)

 srcs-sqlite3   := $(wildcard db-sqlite3/*.lisp)
 srcs-oracle    := $(wildcard db-oracle/*.lisp)
 srcs-tests     := $(wildcard tests/*.lisp)
 srcs-sqlite3   := $(wildcard db-sqlite3/*.lisp)
 srcs-oracle    := $(wildcard db-oracle/*.lisp)
 srcs-tests     := $(wildcard tests/*.lisp)


@@ -56,8 +54,6 @@ clc-aodbc     := $(clc-source)/clsql-aodbc
 lispdir-aodbc  := $(clc-aodbc)/db-aodbc
 clc-odbc       := $(clc-source)/clsql-odbc
 lispdir-odbc   := $(clc-odbc)/db-odbc
 lispdir-aodbc  := $(clc-aodbc)/db-aodbc
 clc-odbc       := $(clc-source)/clsql-odbc
 lispdir-odbc   := $(clc-odbc)/db-odbc

-clc-sqlite     := $(clc-source)/clsql-sqlite
-lispdir-sqlite := $(clc-sqlite)/db-sqlite

 clc-sqlite3    := $(clc-source)/clsql-sqlite3
 lispdir-sqlite3        := $(clc-sqlite3)/db-sqlite3
 clc-oracle     := $(clc-source)/clsql-oracle
 clc-sqlite3    := $(clc-source)/clsql-sqlite3
 lispdir-sqlite3        := $(clc-sqlite3)/db-sqlite3
 clc-oracle     := $(clc-source)/clsql-oracle


@@ -83,7 +79,7 @@ clean:
        [ ! -f Makefile ] || $(MAKE) distclean
        find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
        rm -rf doc/html
        [ ! -f Makefile ] || $(MAKE) distclean
        find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
        rm -rf doc/html

-       dh_clean
+       dh_clean db-mysql/clsql_mysql.dll uffi/clsql_uffi.dll

 
 install: DH_OPTIONS= install-indep install-arch
 
 
 install: DH_OPTIONS= install-indep install-arch
 


@@ -98,7 +94,6 @@ install-indep:
        dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
        dh_installdirs -p $(pkg-aodbc) $(lispdir-aodbc)
        dh_installdirs -p $(pkg-odbc) $(lispdir-odbc)
        dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
        dh_installdirs -p $(pkg-aodbc) $(lispdir-aodbc)
        dh_installdirs -p $(pkg-odbc) $(lispdir-odbc)

-       dh_installdirs -p $(pkg-sqlite) $(lispdir-sqlite)

        dh_installdirs -p $(pkg-sqlite3) $(lispdir-sqlite3)
        dh_installdirs -p $(pkg-oracle) $(lispdir-oracle)
        dh_installdirs -p $(pkg-tests) $(lispdir-tests)
        dh_installdirs -p $(pkg-sqlite3) $(lispdir-sqlite3)
        dh_installdirs -p $(pkg-oracle) $(lispdir-oracle)
        dh_installdirs -p $(pkg-tests) $(lispdir-tests)


@@ -116,8 +111,6 @@ install-indep:
        dh_install -p $(pkg-aodbc) clsql-aodbc.asd $(clc-aodbc)
        dh_install -p $(pkg-odbc) $(srcs-odbc) $(lispdir-odbc)
        dh_install -p $(pkg-odbc) clsql-odbc.asd $(clc-odbc)
        dh_install -p $(pkg-aodbc) clsql-aodbc.asd $(clc-aodbc)
        dh_install -p $(pkg-odbc) $(srcs-odbc) $(lispdir-odbc)
        dh_install -p $(pkg-odbc) clsql-odbc.asd $(clc-odbc)

-       dh_install -p $(pkg-sqlite) $(srcs-sqlite) $(lispdir-sqlite)
-       dh_install -p $(pkg-sqlite) clsql-sqlite.asd $(clc-sqlite)

        dh_install -p $(pkg-sqlite3) $(srcs-sqlite3) $(lispdir-sqlite3)
        dh_install -p $(pkg-sqlite3) clsql-sqlite3.asd $(clc-sqlite3)
        dh_install -p $(pkg-oracle) $(srcs-oracle) $(lispdir-oracle)
        dh_install -p $(pkg-sqlite3) $(srcs-sqlite3) $(lispdir-sqlite3)
        dh_install -p $(pkg-sqlite3) clsql-sqlite3.asd $(clc-sqlite3)
        dh_install -p $(pkg-oracle) $(srcs-oracle) $(lispdir-oracle)

diff --git a/uffi/Makefile b/uffi/Makefile
index 7599380f1c047befc356d12833a898ef84cdaad2..8ae1fd95c9d7b85397d1b1e5c9484f8aadec6e08 100644 (file)
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -57,9 +57,9 @@ else
            gcc $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
            gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib)
            rm -f $(object)
            gcc $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
            gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib)
            rm -f $(object)

-           @echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
-           -gcc -m32 $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
-           -gcc -m32 $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared_lib)
+           #@echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
+           #-gcc -m32 $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
+           #-gcc -m32 $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared_lib)

           else
            gcc -fPIC -DPIC -c $(source) -o $(object)
            ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
           else
            gcc -fPIC -DPIC -c $(source) -o $(object)
            ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)

diff --git a/uffi/clsql_uffi.dll b/uffi/clsql_uffi.dll
deleted file mode 100644 (file)
index 1c41270..0000000
Binary files a/uffi/clsql_uffi.dll and /dev/null differ