From ade04fc6aa18497812f74950f2b10c23fbb5bf68 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 26 Jan 2016 14:41:03 -0700 Subject: [PATCH 01/14] Automated commit for upstream build of version 6.7.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 62869f7..965dbbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (6.7.0-1) unstable; urgency=medium + + * New upstream + + -- Kevin M. Rosenberg 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 -- 2.34.1 From 53fb37c60a470f0ce867b59dd940cc6348cffda1 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 20 Jul 2020 19:56:14 +0000 Subject: [PATCH 02/14] update debian compat --- debian/changelog | 4 ++-- debian/compat | 2 +- debian/control | 8 ++++---- debian/rules | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 965dbbf..6d33d5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -cl-sql (6.7.0-1) unstable; urgency=medium +cl-sql (6.7.1-1) unstable; urgency=medium * New upstream - -- Kevin M. Rosenberg Tue, 26 Jan 2016 14:40:50 -0700 + -- Kevin M. Rosenberg Mon, 20 Jul 2020 19:53:44 +0000 cl-sql (6.6.3-3) unstable; urgency=medium diff --git a/debian/compat b/debian/compat index 7ed6ff8..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +10 diff --git a/debian/control b/debian/control index ca4c4df..845099e 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: cl-sql Section: lisp -Priority: extra +Priority: optional Maintainer: Kevin M. Rosenberg -Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev -Standards-Version: 3.9.5.0 +Build-Depends: dh-lisp, debhelper (>= 7.0.0), default-libmysqlclient-dev, libpq-dev +Standards-Version: 4.5.0.2 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 -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 diff --git a/debian/rules b/debian/rules index 58529cb..fcee0a6 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,7 @@ clean: [ ! -f Makefile ] || $(MAKE) distclean find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \; rm -rf doc/html - dh_clean + dh_clean W: db-mysql/clsql_mysql.dll uffi/clsql_uffi.dll install: DH_OPTIONS= install-indep install-arch -- 2.34.1 From da5f4a9b08f7abadb0000ae996e1ee47b891e4ad Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 20 Jul 2020 19:59:08 +0000 Subject: [PATCH 03/14] update debian compat --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d33d5a..ff78897 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -cl-sql (6.7.1-1) unstable; urgency=medium +cl-sql (6.7.0-2) unstable; urgency=medium - * New upstream + * Update Debian compatibility -- Kevin M. Rosenberg Mon, 20 Jul 2020 19:53:44 +0000 +cl-sql (6.7.0-1) unstable; urgency=medium + * New upstream + + -- Kevin M. Rosenberg 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 -- 2.34.1 From da9282a5c0ce927c613f1706f1c51796c75e16e4 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 20 Jul 2020 20:12:58 +0000 Subject: [PATCH 04/14] Remove old windows .dll files from source --- db-mysql/clsql_mysql.dll | Bin 4608 -> 0 bytes debian/changelog | 4 +++- debian/rules | 2 +- uffi/clsql_uffi.dll | Bin 4608 -> 0 bytes 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 db-mysql/clsql_mysql.dll delete mode 100644 uffi/clsql_uffi.dll diff --git a/db-mysql/clsql_mysql.dll b/db-mysql/clsql_mysql.dll deleted file mode 100644 index 095c0910020f4960799c6a01cc5181b1ba09be9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHKZ)j6j6hEn{rZuV2+94|X)D+y*lDt>eNfk3SqhpPxtx>DfH0^sescBl17p=o; zM=Thg!anTdCKDa_!LbQ4x(Oqgu_{!kx`AxNIjP%YEzIGE))9RB-S-k3rw+%4e(}J$ z=bqpBch9*u_37RA9!()4Gg#Az1|S)^_4S_@73Q*qUzX9ilFN$*O!b!+Z3>0sTz9N% zS1j1cwFRTmE}3hUxL6{}g`?d1jZIue_9)b{?uNvE?}{Y_j!2f2Srd z!?uIEKGk*rvTvSEmxpRCwwR7@w(ZlUKj+t^%f@h9h~><8;PVjGo6O|9mUic{n^d-F zx@lS|O$A~x(B4^)b}*;wc70!D%!eUtPCEIp<`kGg2x4&$q@lJfCVJgO^esokLY_!& zqP`~@Ck;IuQQf4fpVM8a|7~9-OFc5M)9kG5e5}_8O<)h=h+3**Vo(keonVgvfbLTY zSwL<)iz>s7mNMK4X3du|Ws=-P>8h9%>1rc-pTPihKYcz7Fvv}`Hot!%pU(vR%Gdy& zC+)akr6CaXXo*D7bDBdyY|uU37vU^O~3*1mi0 zctzhmEuRAB#P_}Xt7<$`dP*;T`?tan)Y(}}W` z#j~AcKUk&Nm`qNX6x(a4q?Dv=a{weZhWgN|Rxux7f4cc3$3U}?9^Ieh=mgVF&c~u2 z!-a%K%CXyn-JscF1{%T--L6&x(DX9Rqiaxel^)igmW9!B#m1tQlKxBbH0_FRNUmUz zd1WyZ@f$v^q8hc6m8=#u3u!kVT!%GO2T&bEY9J}kh@ho@cfWG))`7J}*6fy}2%f5p887I)(Iuo{@{#zuT*e_~N9LC7ePbT*7p1cytDhL+iLWhPz zAIv7Zcmg5h!{fB4A`bg8@Uojto44Rso|06b;>iwrvgi_bG;z#xM?A^gGm7_)n9~2j zZVv3+eyIU9mm;%Pxg0C=ctQXF1YTWiZ(SOhb=3i%Cq416EF0KUt?Ut#|v zm=U|hyj+978$NJezl{Br0(~Z)Mg^GJANq!2z`r0n9$y-7!h{$+w?}As?rhBP8TJ+q zpCAR;EcAdsgybl|8rd9xJ&ykCjOJ43{`j6qfPFdz;*zwRYH~<4(HV$!?TZt=ltY5; z?NXa8i3aSMd& zta0fDb|V6Xx}s7~Sf&9}Ah$bA>%;M2Yed=_`APsU8e_{5!N%uPQ+TZGNtxPgbKTWFcQn?kfbEJegXM2hZ`L-eSjGuZQFV>H+) zJtjup-~BK=dAEfHCSL~Y?b*?WU)<-PU9}gLp8Evw+X~?jN1a1Xt81rAbalA8U6))} zT;IEHxqf$zyNdZzem2kXmAsQ*#n~S>7RtLWd9+dW2r#r0}Wm zx$vuSSNKzSrMjkieRV_i@#<66D8LcTfv9)-oNqf@oDpZY^PF?Q3Frkq#|iue;Gsr3 diff --git a/debian/changelog b/debian/changelog index ff78897..863944d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -cl-sql (6.7.0-2) unstable; urgency=medium +cl-sql (6.7.0.1-1) unstable; urgency=medium + * Clean source file package * Update Debian compatibility -- Kevin M. Rosenberg Mon, 20 Jul 2020 19:53:44 +0000 cl-sql (6.7.0-1) unstable; urgency=medium + * New upstream -- Kevin M. Rosenberg Tue, 26 Jan 2016 14:40:50 -0700 diff --git a/debian/rules b/debian/rules index fcee0a6..57f41d3 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,7 @@ clean: [ ! -f Makefile ] || $(MAKE) distclean find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \; rm -rf doc/html - dh_clean W: db-mysql/clsql_mysql.dll uffi/clsql_uffi.dll + dh_clean db-mysql/clsql_mysql.dll uffi/clsql_uffi.dll install: DH_OPTIONS= install-indep install-arch diff --git a/uffi/clsql_uffi.dll b/uffi/clsql_uffi.dll deleted file mode 100644 index 1c412707ae4499d74be1b530210cb70ff7f16a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHJe`phT6o1#IZQ7>o*&k9ip;wo}h8l7?nU+=zYfr>A8e3bfT4QXkOKRGbFNy1ZIOacN zLm#~Fd++moKfdqX_l|SzeGRe!z=W*p03#>~IgR!27Y(D0Hf9K&yQ?$$Q`HY)RYM+8c%qX*}1E&4Ero$#t)jyLo^n$^@TXk2y0wx1qSY zkjg87Ttv(%w6qi@jm#J}ZRlC4IT3`+%OE$dX#=;BFo?w6l__(g8sI5JFEIf1Wcyy^ z1Q74Fw+#0)09%*YzB)|0c6^O0WfHi0@418~q5_IX7wKq+Yk0mG*N zO^{}Pf;BkW6k%@mXF@7T_K+F~vf}u`;mkEr3;b+W;04Z{&Mw2lg%71YJt?KLu zh4nf{EpP=1ZF#o5ZTC2@kyDKGb1AV%gvy&sJ~1nG_;Qh2lKLjM&**Tu$Er2Lazan1JU%F)^Uqge@?%FmuqHFcpIx(n3Sxn`Bu z-0@d1L$+47ph%h$ox>FJMM`m*6CcXaMG(u>RxNo`<>%xHNKPuPn!?Xv7)F1<#H&bg zmqnovc`V1y0PQ)T&UB2C#?mx!#~E2UaEFQHmb^D{V_{4ky|_>{FjaM9ehd|Lbh$4H zQ5&shwaH2seub+=%17IjoEoK}B{`)|lHH`wTArQKrm}DB!!3di#iZieoN_zRM{Rl$ zk@7sH7Mbx(YQ9obiGZ}jKY$0;D;NZaV(r5W0Zm*iaYSa|6tRX^;SxWFL-qHUq1K1m zxXEfl)Q@i+9p@0xjWX?t%~-SE2pfutT%t@ZBGGF8&}A`Czh-R6>j-43%^@Q4gIlk# zVr{vG)Pi;{=EPgjZSikJF#aW`MnvJKIbDe^s*bPYMT;)cZMtOECorluI$bh2L>f$i@tGxEM;!gaY6smy9OIj@2x9UQB^B3=O9d^v z33>rN>yjjSw)8~G@eD%PU$zn@iN&%^$pT~BC@8xYb(Nn^Jc8FsHLLmVo$;GkzP)`+ z72;%*i^bPsJ?v4hp-JDHNZ-1YtJhSb=_f<+8<1$V#4FKNzGNBGMXM=(P1p70q0^XsoSz;+{l%yuBCBO#5%2%B3iu2P^@&6tjxbYS=BG`GZ{ue$jO5ru zavV(Mh^2B6@sD!&NDjTmg8uRgRx>4)$(zVS0I7hSSFZrvNj=XiSN!&Jpnaz>1l)Kx zX(ec-k0YwV4?pFCle0#A=d_?oddCfOW+{aXx=2MD@+U_~9@A6Kpxe7Du zHRZSx_#yqjCvdttb^dKA_ad)HK8Ab}If(2;UW=R|azlttSxpT@BUSY!+j8q7yEs@ZxqJhRsIv1mz{3_b^OQzEW=_%C)i)m{q%n>t1B!B0GlaK zpf@0jLbwNRW%YQ2#vjfF@OXXQQbhE0`2x@4UnY1w4SjukI{U;efgn1=FW?dSJB2>c zBo@C!)&$1u0=h-jVYwY*z&#cBK zS#ab!DjW{S7RRTKdB>6?kF#(qxD8wbw~c$Adx?9M`<(llo8)FV$NG)rL&5-5qNuk! X?M-&KeZT#n{j~jz9ifNxADO_fYM`1~ -- 2.34.1 From 3585add739a2107d688ea5d58841727022546d3e Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 28 Sep 2020 21:29:25 +0000 Subject: [PATCH 05/14] debian update --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 863944d..d578262 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (6.7.0.1-2) unstable; urgency=medium + + * Source only package upload (closes: 970609) + + -- Kevin M. Rosenberg Mon, 28 Sep 2020 20:42:03 +0000 + cl-sql (6.7.0.1-1) unstable; urgency=medium * Clean source file package diff --git a/debian/control b/debian/control index 845099e..029850d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: lisp Priority: optional Maintainer: Kevin M. Rosenberg Build-Depends: dh-lisp, debhelper (>= 7.0.0), default-libmysqlclient-dev, libpq-dev -Standards-Version: 4.5.0.2 +Standards-Version: 4.5.0.3 Homepage: http://clsql.kpe.io/ Vcs-Git: git://git.kpe.io/clsql.git Vcs-Browser: http://git.kpe.io/?p=clsql.git -- 2.34.1 From d29eb47a478a8f55c765e4d28df3f5af0147ea70 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 1 Oct 2020 10:38:25 -0600 Subject: [PATCH 06/14] Use modern ASDF test-op --- clsql.asd | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/clsql.asd b/clsql.asd index 4f00950..37263ce 100644 --- a/clsql.asd +++ b/clsql.asd @@ -94,12 +94,8 @@ oriented interface." (: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")) @@ -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)))) - -- 2.34.1 From 2c6e13678a2932c54b40317b8a40eb0e772aa08b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 1 Oct 2020 10:38:46 -0600 Subject: [PATCH 07/14] Add use on unknown mysql versions --- db-mysql/mysql-client-info.lisp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db-mysql/mysql-client-info.lisp b/db-mysql/mysql-client-info.lisp index 9b791df..a944d45 100644 --- 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 - (error "Unknown mysql client version '~A'." *mysql-client-info*))))) - + (format t "Warning: Unknown mysql client version '~A', verify proper operation." *mysql-client-info*))))) -- 2.34.1 From 7ec0d09779e138e6c4973be2a39e0a2082c7db4a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 1 Oct 2020 10:39:01 -0600 Subject: [PATCH 08/14] Debian compatibility updates --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 029850d..455d1e2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cl-sql Section: lisp Priority: optional Maintainer: Kevin M. Rosenberg -Build-Depends: dh-lisp, debhelper (>= 7.0.0), default-libmysqlclient-dev, libpq-dev +Build-Depends: dh-lisp, debhelper (>= 11.0.0), default-libmysqlclient-dev, libpq-dev Standards-Version: 4.5.0.3 Homepage: http://clsql.kpe.io/ Vcs-Git: git://git.kpe.io/clsql.git -- 2.34.1 From 01e851cfd63a4be59ee8c1c7231c1ef86b37b768 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 1 Oct 2020 16:39:57 +0000 Subject: [PATCH 09/14] Automated commit for upstream build of version 6.7.1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d578262..906d4b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (6.7.1-1) unstable; urgency=medium + + * New upstream + + -- Kevin M. Rosenberg Thu, 01 Oct 2020 16:39:41 +0000 + cl-sql (6.7.0.1-2) unstable; urgency=medium * Source only package upload (closes: 970609) -- 2.34.1 From cc0da6fce14b3ecd9092ca7baceaf5651a14202a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 13 Oct 2020 03:05:12 +0000 Subject: [PATCH 10/14] Remove from Debian package support for deprecated SQLite 2 library --- debian/changelog | 6 ++++++ debian/control | 9 --------- debian/rules | 9 +-------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 906d4b7..9987179 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (6.7.1-2) unstable; urgency=medium + + * Remove cl-sql-sqlite binary package (closes: 972124) + + -- Kevin M. Rosenberg Tue, 13 Oct 2020 02:51:11 +0000 + cl-sql (6.7.1-1) unstable; urgency=medium * New upstream diff --git a/debian/control b/debian/control index 455d1e2..84e80fe 100644 --- a/debian/control +++ b/debian/control @@ -74,15 +74,6 @@ Description: CLSQL database backend, PostgreSQL via sockets 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} diff --git a/debian/rules b/debian/rules index 57f41d3..8db784f 100755 --- 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-sqlite := cl-sql-sqlite 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) @@ -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-sqlite := $(wildcard db-sqlite/*.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 -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 @@ -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-sqlite) $(lispdir-sqlite) 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-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) -- 2.34.1 From 2b8785e267fc9b9675aff0ec407976ad50701159 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 29 Oct 2020 17:37:43 +0000 Subject: [PATCH 11/14] Remove deprecated cl-sql-sqlite from Debian cl-sql-tests package --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9987179..fab89c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (6.7.1-3) unstable; urgency=medium + + * Remove cl-sql-sqlite from cl-sql-tests dependencies (closes: 973358) + + -- Kevin M. Rosenberg 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) diff --git a/debian/control b/debian/control index 84e80fe..c23ac9a 100644 --- a/debian/control +++ b/debian/control @@ -95,7 +95,7 @@ Description: CLSQL database backend, Oracle 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 -- 2.34.1 From 41231d786970edbda805198ea142f9dc6ffd6e27 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 16 Feb 2021 13:18:12 -0700 Subject: [PATCH 12/14] Remove 32-bit builds on 64-bit Linux --- db-mysql/Makefile | 6 +++--- uffi/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db-mysql/Makefile b/db-mysql/Makefile index cf7c71d..fed4bcc 100644 --- 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) - @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) diff --git a/uffi/Makefile b/uffi/Makefile index 7599380..8ae1fd9 100644 --- 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) - @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) -- 2.34.1 From 84a15f339cf837624cae68f8f414acb2f738d95d Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 29 Oct 2022 04:28:44 +0000 Subject: [PATCH 13/14] Version 6.7.2: Now licensed under more permissive MIT license --- COPYING.CLSQL | 18 --------- COPYING.MaiSQL | 25 ------------ COPYING.SQL-ODBC | 21 ---------- COPYING.USQL | 24 ------------ ChangeLog | 5 +++ debian/changelog | 6 +++ debian/copyright | 100 +++++++++++------------------------------------ 7 files changed, 34 insertions(+), 165 deletions(-) delete mode 100644 COPYING.CLSQL delete mode 100644 COPYING.MaiSQL delete mode 100644 COPYING.SQL-ODBC delete mode 100644 COPYING.USQL diff --git a/COPYING.CLSQL b/COPYING.CLSQL deleted file mode 100644 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 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 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 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 8827550..a66a94a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-10-28 Kevin Rosenberg + * 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 * Version 6.7.0 release * sql/utils.lisp: Apply patch from Martin Simmons for diff --git a/debian/changelog b/debian/changelog index fab89c3..04102c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (6.7.2-1) unstable; urgency=medium + + * LICENSE: CLSQL is now licensed under MIT license + + -- Kevin M. Rosenberg Thu, 29 Oct 2020 17:35:49 +0000 + cl-sql (6.7.1-3) unstable; urgency=medium * Remove cl-sql-sqlite from cl-sql-tests dependencies (closes: 973358) diff --git a/debian/copyright b/debian/copyright index 71a7cb7..f571eac 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,81 +8,27 @@ Debian Maintainer: (Same as upstream) 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 +Copyright (C) 1999-2001 Pierre R. Mai (MaiSQL ) +Copyright (C) 1999-2020 onShore Development (UncommonSQL) +Copyright (C) 1999-2001 Paul Meurer (SQL/ODBC) +Copyright (C) 2010-2015 Marc Battyani + +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. -- 2.34.1 From 2c2a20b69856dd30873e209d6a2d797e0fa00846 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 29 Oct 2022 04:31:01 +0000 Subject: [PATCH 14/14] Automated commit for debian release 6.7.2-1 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04102c4..2e9469e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ cl-sql (6.7.2-1) unstable; urgency=medium * LICENSE: CLSQL is now licensed under MIT license - -- Kevin M. Rosenberg Thu, 29 Oct 2020 17:35:49 +0000 + -- Kevin M. Rosenberg Sat, 29 Oct 2022 04:30:27 +0000 cl-sql (6.7.1-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index c23ac9a..d859168 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: lisp Priority: optional Maintainer: Kevin M. Rosenberg Build-Depends: dh-lisp, debhelper (>= 11.0.0), default-libmysqlclient-dev, libpq-dev -Standards-Version: 4.5.0.3 +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 -- 2.34.1