r1994: *** empty log message ***

diff --git a/debian/cl-sql-mysql.dirs b/debian/cl-sql-mysql.dirs
new file mode 100644 (file)
index 0000000..e31bb3d
--- /dev/null
+++ b/debian/cl-sql-mysql.dirs
@@ -0,0 +1,13 @@
+usr
+usr/share
+usr/share/common-lisp
+usr/share/common-lisp/systems
+usr/share/common-lisp/source
+usr/share/common-lisp/repositories
+usr/share/common-lisp/repositories/clsql
+usr/share/common-lisp/repositories/clsql/interfaces
+usr/share/common-lisp/repositories/clsql/interfaces/mysql
+
+
+
+

diff --git a/debian/cl-sql-postgresql-socket.dirs b/debian/cl-sql-postgresql-socket.dirs
new file mode 100644 (file)
index 0000000..5559d66
--- /dev/null
+++ b/debian/cl-sql-postgresql-socket.dirs
@@ -0,0 +1,12 @@
+usr
+usr/share
+usr/share/common-lisp
+usr/share/common-lisp/systems
+usr/share/common-lisp/source
+usr/share/common-lisp/repositories
+usr/share/common-lisp/repositories/clsql
+usr/share/common-lisp/repositories/clsql/interfaces
+usr/share/common-lisp/repositories/clsql/interfaces/postgresql-socket
+
+
+

diff --git a/debian/cl-sql-postgresql.dirs b/debian/cl-sql-postgresql.dirs
new file mode 100644 (file)
index 0000000..6899ab6
--- /dev/null
+++ b/debian/cl-sql-postgresql.dirs
@@ -0,0 +1,12 @@
+usr
+usr/share
+usr/share/common-lisp
+usr/share/common-lisp/systems
+usr/share/common-lisp/source
+usr/share/common-lisp/repositories
+usr/share/common-lisp/repositories/clsql
+usr/share/common-lisp/repositories/clsql/interfaces
+usr/share/common-lisp/repositories/clsql/interfaces/postgresql
+
+
+

diff --git a/debian/cl-sql.dirs b/debian/cl-sql.dirs
new file mode 100644 (file)
index 0000000..767ea06
--- /dev/null
+++ b/debian/cl-sql.dirs
@@ -0,0 +1,11 @@
+usr
+usr/share
+usr/share/common-lisp
+usr/share/common-lisp/systems
+usr/share/common-lisp/source
+usr/share/common-lisp/repositories
+usr/share/doc
+usr/share/doc/cl-sql
+
+
+

diff --git a/debian/cl-sql.doc-base b/debian/cl-sql.doc-base
index 4034263a37e545a020cc71d23aefc03c41320f15..af2a51e9e69d4a3e78dfe6ee112c70a990a7f3fe 100644 (file)
--- a/debian/cl-sql.doc-base
+++ b/debian/cl-sql.doc-base
@@ -5,8 +5,8 @@ Abstract: Describes the
  use the CLSQL Common Lisp library.
 Section: lisp
 
  use the CLSQL Common Lisp library.
 Section: lisp
 

-Format: postscript
-Files: /usr/share/doc/cl-sql/cl-sql.ps.gz
+Format: PDF
+Files: /usr/share/doc/cl-sql/cl-sql.pdf.gz

 
 Format: HTML
 Index: /usr/share/doc/cl-sql/html/index.html
 
 Format: HTML
 Index: /usr/share/doc/cl-sql/html/index.html

diff --git a/debian/control b/debian/control
index 4701fb2a7626a95cdd720be669e5d44203a3d51e..c3446fd4816f5dcbf1a69202fb43b2ec73a5ab48 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,48 @@ Source: cl-sql
 Section: devel
 Priority: optional
 Maintainer: Kevin Rosenberg <kevin@rosenberg.net>
 Section: devel
 Priority: optional
 Maintainer: Kevin Rosenberg <kevin@rosenberg.net>

+Uploaders: Adam Di Carlo <aph@debian.org>

 Build-Depends-Indep: debhelper (>> 3.0.0)
 Standards-Version: 3.5.2
 
 Package: cl-sql
 Architecture: all
 Build-Depends-Indep: debhelper (>> 3.0.0)
 Standards-Version: 3.5.2
 
 Package: cl-sql
 Architecture: all

+Depends: cl-sql-base
+Description: SQL Interface for Common Lisp
+ CLSQL uses the UFFI library to provide SQL to multiple SQL databases
+ on multiple Common Lisp implementations.
+
+Package: cl-sql-base
+Architecture: all

 Depends: common-lisp-controller, cl-uffi, cmucl | lisp-compiler
 Depends: common-lisp-controller, cl-uffi, cmucl | lisp-compiler

+Recommends: cl-sql-backend

 Description: SQL Interface for Common Lisp
  CLSQL uses the UFFI library to provide SQL to multiple SQL databases
  on multiple Common Lisp implementations.
 
 Description: SQL Interface for Common Lisp
  CLSQL uses the UFFI library to provide SQL to multiple SQL databases
  on multiple Common Lisp implementations.
 

+Package: cl-sql-mysql
+Architecture: all
+Depends: cl-sql-base (>= ${Source-Version}), libmysqlclient10-dev
+Provides: cl-sql-backend
+Description: UncommonSQL database backend, MySQL
+ This package enables you to use the CLSQL data access package
+ with MySQL databases.
+
+Package: cl-sql-postgresql
+Architecture: all
+Depends: cl-sql-base (>= ${Source-Version}), postgresql-client
+Provides: cl-sql-backend
+Description: UncommonSQL database backend, PostgreSQL
+ This package enables you to use the CLSQL data access package
+ with PostgreSQL databases.
+
+Package: cl-sql-postgresql-socket
+Architecture: all
+Depends: cl-sql-base (>= ${Source-Version})
+Provides: cl-sql-backend
+Description: UncommonSQL database backend, PostgreSQL
+ This package enables you to use the CLSQL data access package
+ with PostgreSQL databases via a socket interface.
+
+
+

diff --git a/debian/rules b/debian/rules
index f72fb51fe4dea95c177fcbf0c89255b931963918..9cd5d6dd36f29b277aec81145805ad69b2fbd9f0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,24 +8,43 @@ export DH_VERBOSE=1
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 

-pkg    := cl-sql
-prefix := debian/$(pkg)
+pkg            := cl-sql
+pkg-base       := cl-sql-base
+pkg-mysql      := cl-sql-mysql
+pkg-pg         := cl-sql-postgresql
+pkg-pg-socket  := cl-sql-postgresql-socket
+all-pkgs       := $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket)
+
+prefix         := debian/$(pkg)
+prefix-base    := debian/$(pkg-base)
+prefix-mysql   := debian/$(pkg-mysql)
+prefix-pg      := debian/$(pkg-pg)
+prefix-pg-socket := debian/$(pkg-pg-socket)
+
+##
+## lisp sources per pkg
+##
+srcs           := sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.cl sql/usql.cl
+                  $(filter-out sql/metadata.lisp,$(wildcard sql/*.lisp))
+srcs-base      := sql/package.cl sql/db-interface.cl sql/classes.cl sql/conditions.cl $(wilcard cmu-compat/*.cl)
+srcs-mysql     := $(wildcard interfaces/mysql/*.cl)
+srcs-pg                := $(wildcard interfaces/postgresql/*.cl)
+srcs-pg-socket := $(wildcard interfaces/postgresql-socket/*.cl)

 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
 INSTALLDIRFLAGS        := -d -g root -o root -m 0755
 
 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
 INSTALLDIRFLAGS        := -d -g root -o root -m 0755
 

-SOURCEDIR      := $(prefix)/usr/share/common-lisp/source
-REPOSITORYDIR  := $(prefix)/usr/share/common-lisp/repositories/clsql
-SYSDIR         := $(prefix)/usr/share/common-lisp/systems
-DOCDIR         := $(prefix)/usr/share/doc/cl-sql
+clc-source     := /usr/share/common-lisp/source
+clc-repositories:= /usr/share/common-lisp/repositories/clsql
+clc-systems    := /usr/share/common-lisp/systems
+doc-dir                := $(prefix)/usr/share/doc/cl-sql

 
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
 
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.

-

        touch configure-stamp
 
 
        touch configure-stamp
 
 


@@ -33,21 +52,14 @@ build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 
 build-stamp: configure-stamp 
        dh_testdir

-

        # Add here commands to compile the package.
        # Add here commands to compile the package.

-       $(MAKE) doc
-       #/usr/bin/docbook-to-man debian/clsql.sgml > cl-sql.1
-

        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp

-

        # Add here commands to clean up after the build process.
        # Add here commands to clean up after the build process.

-       -$(MAKE) clean
-

        dh_clean
 
 install: build
        dh_clean
 
 install: build


@@ -56,18 +68,27 @@ install: build
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 

-       # Add here commands to install the package into debian/cl-sql.
-       $(INSTALL) $(INSTALLDIRFLAGS) $(REPOSITORYDIR) $(REPOSITORYDIR)/mcl $(SYSDIR) $(DOCDIR) $(DOCDIR)/html $(SOURCEDIR)
+       # CLSQL-Base

        $(INSTALL) $(INSTALLFLAGS) clsql.system.debian $(SYSDIR)
        mv $(SYSDIR)/clsql.system.debian $(SYSDIR)/clsql.system
        $(INSTALL) $(INSTALLFLAGS) $(shell echo sql/*.cl) $(REPOSITORYDIR)/sql
        $(INSTALL) $(INSTALLFLAGS) $(shell echo src/interfaces/*.cl) $(REPOSITORYDIR)/interfaces
        $(INSTALL) $(INSTALLFLAGS) clsql.system.debian $(SYSDIR)
        mv $(SYSDIR)/clsql.system.debian $(SYSDIR)/clsql.system
        $(INSTALL) $(INSTALLFLAGS) $(shell echo sql/*.cl) $(REPOSITORYDIR)/sql
        $(INSTALL) $(INSTALLFLAGS) $(shell echo src/interfaces/*.cl) $(REPOSITORYDIR)/interfaces

+
+       # Documentation

        $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html
        $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html

-       cp doc/clsql.ps doc/cl-sql.ps
-       rm -f doc/cl-sql.ps.gz
-       gzip doc/cl-sql.ps
-       $(INSTALL) $(INSTALLFLAGS) doc/cl-sql.ps.gz $(DOCDIR)
-       rm -f doc/cl-sql.ps.gz
+       cp doc/clsql.pdf doc/cl-sql.pdf
+       rm -f doc/cl-sql.pdf.gz
+       gzip doc/cl-sql.pdf
+       $(INSTALL) $(INSTALLFLAGS) doc/cl-sql.pdf.gz $(DOCDIR)
+       rm -f doc/cl-sql.pdf.gz
+
+       # CLC Systems
+       $(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/
+       $(INSTALL) $(INSTALLFLAGS) clsql-base.system $(prefix-base)/$(clc-systems)/
+       $(INSTALL) $(INSTALLFLAGS) clsql-mysql.system $(prefix-mysql)/$(clc-systems)/
+       $(INSTALL) $(INSTALLFLAGS) clsql-postgresql.system $(prefix-pg)/$(clc-systems)/
+       $(INSTALL) $(INSTALLFLAGS) clsql-postgresql-socket.system $(prefix-pg-socket)/$(clc-systems)/
+

 
 # Build architecture-independent files here.
 binary-indep: build install
 
 # Build architecture-independent files here.
 binary-indep: build install