From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 7 Apr 2004 17:08:55 +0000 (+0000)
Subject: r8853: support new cl-sql-classic package
X-Git-Tag: v3.8.6~722
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=f1b49f1c1d68a89643855430d98ad61e824919ea

r8853: support new cl-sql-classic package
---

diff --git a/debian/changelog b/debian/changelog
index d4c04e9..7b64d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
 cl-sql (2.2.0-1) unstable; urgency=low
 
-  * Rewrote usql-tutorial.txt to usql.xml and integrated with CLSQL
-  documents.
-  * CLSQL and CLSQL-USQL can be loaded and imported into the same
-  package.
-  * Add CLSQL-USQL binary package
+  * Integrate uncommonsql package code.
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Tue,  6 Apr 2004 09:35:28 -0600
 
diff --git a/debian/control b/debian/control
index c4b2dbb..3776dd4 100644
--- a/debian/control
+++ b/debian/control
@@ -79,11 +79,11 @@ Description: CLSQL database backend, SQLite
  with SQLite databases. 
  CLSQL is a Common Lisp interface to SQL databases.
 
-Package: cl-sql-usql
+Package: cl-sql-classic
 Architecture: all
 Depends: cl-sql-base (>= ${Source-Version})
-Description: UncommonSQL high-level CLSQL interface
- This package provides the UncommonSQL high-level interface for CLSQL.
+Description: Classic CLSQL high-level interface
+ This package provides the Classic, original high-level interface for CLSQL.
  CLSQL is a Common Lisp interface to SQL databases.
 
 Package: cl-sql-tests
diff --git a/debian/rules b/debian/rules
index 8bd136f..81bb0af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ plain-pkg	:= clsql
 pkg		:= cl-sql
 pkg-base	:= cl-sql-base
 pkg-uffi	:= cl-sql-uffi
+pkg-classic	:= cl-sql-classic
 pkg-mysql	:= cl-sql-mysql
 pkg-pg		:= cl-sql-postgresql
 pkg-pg-socket	:= cl-sql-postgresql-socket
@@ -19,6 +20,7 @@ UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < deb
 ## Lisp sources
 srcs		:= $(wildcard sql/*.lisp) clsql.asd
 srcs-base	:= $(wildcard base/*.lisp) 
+srcs-classic	:= $(wildcard classic/*.lisp) 
 srcs-uffi	:= $(wildcard uffi/*.lisp) $(wildcard uffi/*.c)
 srcs-uffi-so	:= $(wildcard uffi/*.so)
 srcs-mysql	:= $(wildcard db-mysql/*.lisp) $(wildcard db-mysql/*.c)
@@ -40,7 +42,9 @@ clc-sql		:= $(clc-source)/clsql
 lispdir-sql	:= $(clc-sql)/sql
 clc-base	:= $(clc-source)/clsql-base
 lispdir-base	:= $(clc-base)/base
-clc-uffi	 := $(clc-source)/clsql-uffi
+clc-classic	:= $(clc-source)/clsql-classic
+lispdir-classic := $(clc-classic)/classic
+clc-uffi	:= $(clc-source)/clsql-uffi
 lispdir-uffi 	:= $(clc-uffi)/uffi
 sodir-uffi 	:= usr/lib/clsql
 clc-mysql	:= $(clc-source)/clsql-mysql
@@ -97,6 +101,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+
 	# Add here commands to install the package into debian/uffi.
 	dh_installdirs --all  $(clc-systems) $(clc-source)
 	dh_installdirs -p $(pkg) $(lispdir-sql)
@@ -117,6 +122,10 @@ install: build
 	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
 	dh_install -p $(pkg-base) clsql-base.asd $(clc-base)
 
+	# Classic
+	dh_install -p $(pkg-classic) $(srcs-classic) $(lispdir-classic)
+	dh_install -p $(pkg-classic) clsql-classic.asd $(clc-classic)
+
 	# UFFI
 	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
 	dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
@@ -141,6 +150,7 @@ install: build
 	# CLC Systems
 	dh_link -p $(pkg) $(clc-clsql)/clsql.asd $(clc-systems)/clsql.asd
 	dh_link -p $(pkg-base) $(clc-base)/clsql-base.asd $(clc-systems)/clsql-base.asd
+	dh_link -p $(pkg-classic) $(clc-classic)/clsql-classic.asd $(clc-systems)/clsql-classic.asd
 	dh_link -p $(pkg-uffi) $(clc-uffi)/clsql-uffi.asd $(clc-systems)/clsql-uffi.asd
 	dh_link -p $(pkg-mysql) $(clc-mysql)/clsql-mysql.asd $(clc-systems)/clsql-mysql.asd
 	dh_link -p $(pkg-pg) $(clc-pg)/clsql-postgresql.asd $(clc-systems)/clsql-postgresql.asd