convert to dh-lisp; add Vcs-Browser

diff --git a/debian/changelog b/debian/changelog
index f6b89a31db88ed78de666a84dab93e00f4e56fb0..1c0bbdbed063e00cdd1348e3bfefbccf4c38a96c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-sql (4.0.5-4) unstable; urgency=low
+
+  * debian/control:
+    - Add Vcs-Browser field
+    - Convert to dh-lisp
+  * debian/rules:
+    - Simplify install rules utilizing more debhelper functions
+    - Convert to dh-lisp
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 04 Aug 2009 02:21:14 -0600
+
 cl-sql (4.0.5-3) unstable; urgency=low
 
   * control: Update debhelper compat to 7, add Homepage and Vgs-Git

diff --git a/debian/cl-sql-base.prerm b/debian/cl-sql-base.prerm
deleted file mode 100755 (executable)
index 27e41ff..0000000
--- a/debian/cl-sql-base.prerm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    remove|upgrade|deconfigure|failed-upgrade)
-       rm -fr /usr/share/doc/cl-sql-doc/html
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-       ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/cl-sql.doc-base b/debian/cl-sql.doc-base
index 6a89beb79f2577dacc11919dd35f5b201c542c41..698835be6413a1414efd5f9d7d66a34665be1a93 100644 (file)
--- a/debian/cl-sql.doc-base
+++ b/debian/cl-sql.doc-base
@@ -5,7 +5,7 @@ Abstract: Describes the use of the CLSQL Common Lisp library.
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/cl-sql/cl-sql.pdf.gz
+Files: /usr/share/doc/cl-sql/clsql.pdf.gz
 
 Format: HTML
 Index: /usr/share/doc/cl-sql/html/index.html

diff --git a/debian/control b/debian/control
index 8016a376c1d66798c429751922b54f47a8175383..1a7d1dbf53793ff8daa75dc326edb2349f5d0d6c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: cl-sql
 Section: lisp
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
+Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
 Standards-Version: 3.8.2.0
 Homepage: http://clsql.b9.com/
 Vcs-Git: git://git.b9.com/clsql.git
+Vcs-Browser: http://git.b9.com/?p=clsql.git
 
 Package: cl-sql
 Architecture: all
-Depends: common-lisp-controller (>= 3.37) 
+Depends: ${misc:Depends}
 Recommends: cl-sql-backend
 Description: SQL Interface for Common Lisp
  CLSQL is a Common Lisp interface for multiple SQL databases
@@ -18,7 +19,7 @@ Description: SQL Interface for Common Lisp
 
 Package: cl-sql-uffi
 Architecture: any
-Depends: cl-uffi (>= 1.5.11), cl-sql (= ${source:Version}), ${shlibs:Depends}
+Depends: cl-uffi (>= 1.5.11), cl-sql (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: cl-sql-backend
 Description: Common UFFI functions for CLSQL database backends
  This package provides an interface to several UFFI functions used by multiple
@@ -27,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}, libmysqlclient-dev
+Depends: cl-sql (= ${source:Version}), cl-sql-uffi (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libmysqlclient-dev
 Provides: cl-sql-backend
 Description: CLSQL database backend, MySQL
  This package enables you to use the CLSQL data access package
@@ -36,7 +37,7 @@ Description: CLSQL database backend, MySQL
 
 Package: cl-sql-aodbc
 Architecture: all
-Depends: cl-sql (= ${source:Version}), cl-sql-mysql, cl-sql-postgresql
+Depends: cl-sql (= ${source:Version}), cl-sql-mysql, cl-sql-postgresql, ${misc:Depends}
 Provides: cl-sql-backend
 Suggests: acl-pro-installer
 Description: CLSQL database backend, AODBC
@@ -46,7 +47,7 @@ Description: CLSQL database backend, AODBC
 
 Package: cl-sql-odbc
 Architecture: all
-Depends: cl-sql (= ${source:Version}), unixodbc-dev, cl-sql-mysql, cl-sql-postgresql
+Depends: cl-sql (= ${source:Version}), unixodbc-dev, cl-sql-mysql, cl-sql-postgresql, ${misc:Depends}
 Provides: cl-sql-backend
 Suggests: acl-pro-installer
 Description: CLSQL database backend, ODBC
@@ -56,7 +57,7 @@ Description: CLSQL database backend, ODBC
 
 Package: cl-sql-postgresql
 Architecture: all
-Depends: cl-sql (= ${source:Version}), libpq-dev, cl-sql-uffi (>= ${source:Version})
+Depends: cl-sql (= ${source:Version}), libpq-dev, cl-sql-uffi (>= ${source:Version}), ${misc:Depends}
 Provides: cl-sql-backend
 Description: CLSQL database backend, PostgreSQL via library
  This package enables you to use the CLSQL data access package
@@ -65,7 +66,7 @@ Description: CLSQL database backend, PostgreSQL via library
 
 Package: cl-sql-postgresql-socket
 Architecture: all
-Depends: cl-sql (= ${source:Version}), cl-md5, cl-sql-uffi (>= ${source:Version}), libc6-dev
+Depends: cl-sql (= ${source:Version}), cl-md5, cl-sql-uffi (>= ${source:Version}), libc6-dev, ${misc:Depends}
 Provides: cl-sql-backend
 Description: CLSQL database backend, PostgreSQL via sockets
  This package enables you to use the CLSQL data access package
@@ -75,7 +76,7 @@ Description: CLSQL database backend, PostgreSQL via sockets
 
 Package: cl-sql-sqlite
 Architecture: all
-Depends: cl-sql (= ${source:Version}), libsqlite0-dev, cl-sql-uffi (>= ${source:Version})
+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
@@ -84,7 +85,7 @@ Description: CLSQL database backend, SQLite
 
 Package: cl-sql-sqlite3
 Architecture: all
-Depends: cl-sql (= ${source:Version}), libsqlite3-dev, cl-sql-uffi (>= ${source:Version})
+Depends: cl-sql (= ${source:Version}), libsqlite3-dev, cl-sql-uffi (>= ${source:Version}), ${misc:Depends}
 Provides: cl-sql-backend
 Description: CLSQL database backend, SQLite3
  This package enables you to use the CLSQL data access package
@@ -94,7 +95,7 @@ Description: CLSQL database backend, SQLite3
 Package: cl-sql-oracle
 Section: contrib/lisp
 Architecture: all
-Depends: cl-sql (= ${source:Version}), cl-sql-uffi (>= ${source:Version})
+Depends: cl-sql (= ${source:Version}), cl-sql-uffi (>= ${source:Version}), ${misc:Depends}
 Provides: cl-sql-backend
 Description: CLSQL database backend, Oracle
  This package enables you to use the CLSQL data access package
@@ -103,7 +104,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
+Depends: cl-sql, cl-sql-postgresql, cl-sql-postgresql-socket, cl-sql-mysql, cl-sql-sqlite, 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

diff --git a/debian/postinst.template b/debian/postinst.template
deleted file mode 100644 (file)
index 7916b34..0000000
--- a/debian/postinst.template
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh 
-set -e
-
-pkg=%%
-
-case "$1" in
-    configure)
-       #clc-only-compatible $pkg allegro cmucl lispworks openmcl
-       register-common-lisp-source $pkg
-       ;;
-    abort-upgrade|abort-remove|abort-deconfigure)
-       ;;
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-       ;;
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/preinst.template b/debian/preinst.template
deleted file mode 100644 (file)
index e0b5f37..0000000
--- a/debian/preinst.template
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# This is part of clsql program: 
-#    http://clsql.med-info.com
-#
-# Copyright (c) 2002 Kevin M. Rosenberg
-
-set -e
-
-pkg=%%
-dir=/usr/share/common-lisp/source/$pkg
-
-case "$1" in
-    install|upgrade|abort-upgrade)
-       test -h $dir && rm $dir 
-       rm -rf ${dir}-[0-9\.]*
-       ;;
-    *)
-        echo "preinst called with unknown argument '$1'" >&2
-       ;;
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/prerm.template b/debian/prerm.template
deleted file mode 100644 (file)
index 4df1118..0000000
--- a/debian/prerm.template
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-pkg=%%
-
-case "$1" in
-    remove|upgrade|deconfigure)
-       unregister-common-lisp-source ${pkg}
-        ;;
-
-    failed-upgrade)
-        ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-       ;;
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/rules b/debian/rules
index 40b720d22b42a73fdee43dacaed9b714a2d27366..4765cc585f9795d1220454af1e2d297c4f009ed6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,31 +65,24 @@ lispdir-oracle      := $(clc-oracle)/db-oracle
 clc-tests      := $(clc-source)/clsql-tests
 lispdir-tests  := $(clc-tests)/tests
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       touch configure-stamp
-
 
-build-arch: configure-stamp build-arch-stamp
+build-arch: build-arch-stamp
 build-arch-stamp:
        dh_testdir
        $(MAKE)
        touch build-arch-stamp
 
-build-indep: configure-stamp  build-indep-stamp
-build-indep-stamp:
-       dh_testdir
-       touch build-indep-stamp
+build-indep:
 
-build: build-arch build-indep
+build: build-arch
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-arch-stamp build-indep-stamp configure-stamp
+       rm -f build-arch-stamp
        [ ! -f Makefile ] || $(MAKE) distclean
        find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
+       rm -rf doc/html
        dh_clean
 
 install: DH_OPTIONS=
@@ -144,52 +137,17 @@ install: build
        dh_install -p $(pkg-tests) $(srcs-tests) $(lispdir-tests)
        dh_install -p $(pkg-tests) clsql-tests.asd $(clc-tests)
 
-       # CLC Systems
-       dh_link -p $(pkg) $(clc-clsql)/clsql.asd $(clc-systems)/clsql.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
-       dh_link -p $(pkg-pg-socket) $(clc-pg-socket)/clsql-postgresql-socket.asd $(clc-systems)/clsql-postgresql-socket.asd
-       dh_link -p $(pkg-aodbc) $(clc-aodbc)/clsql-aodbc.asd $(clc-systems)/clsql-aodbc.asd
-       dh_link -p $(pkg-odbc) $(clc-odbc)/clsql-odbc.asd $(clc-systems)/clsql-odbc.asd
-       dh_link -p $(pkg-sqlite) $(clc-sqlite)/clsql-sqlite.asd $(clc-systems)/clsql-sqlite.asd
-       dh_link -p $(pkg-sqlite3) $(clc-sqlite3)/clsql-sqlite3.asd $(clc-systems)/clsql-sqlite3.asd
-       dh_link -p $(pkg-oracle) $(clc-oracle)/clsql-oracle.asd $(clc-systems)/clsql-oracle.asd
-       dh_link -p $(pkg-tests) $(clc-tests)/clsql-tests.asd $(clc-systems)/clsql-tests.asd
-
        # Documentation
        rm -rf doc/html
        (cd doc; tar xzf html.tar.gz; cd ..)
-       dh_install -p $(pkg) doc/html $(doc-dir)
-       rm -rf doc/html
-       cp doc/clsql.pdf doc/cl-sql.pdf
-       rm -f doc/cl-sql.pdf.gz
-       gzip doc/cl-sql.pdf
-       dh_install -p $(pkg) doc/cl-sql.pdf.gz $(doc-dir)
-       rm -f doc/cl-sql.pdf.gz
-
-       set -e ;\
-       for p in $(all-pkgs); do \
-                echo "processing maintainer scripts for $$p" ;\
-               l=`echo $$p | sed -e "s/^cl-/cl/;"` ;\
-               sed -e "s/%%/$$l/;" debian/preinst.template > debian/$$p.preinst ;\
-               sed -e "s/%%/$$l/;" debian/prerm.template > debian/$$p.prerm ;\
-               sed -e "s/%%/$$l/;" debian/postinst.template > debian/$$p.postinst ;\
-               chown root.root debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
-               chmod +x debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
-       done
-
-
-binary-indep: build install
+
+binary-indep: install
        dh_testdir -i
        dh_testroot -i
-       dh_installdocs -i
-       dh_installexamples -i examples/*
-       dh_installmenu -i
-       dh_installcron -i
-       dh_installinfo -i
-       dh_installchangelogs ChangeLog -i
-       dh_link -i
+       dh_installdocs -i -p $(pkg) doc/html doc/clsql.pdf
+       dh_installexamples -i -p $(pkg) examples/*
+       dh_installchangelogs -i
+       dh_lisp -i
        dh_compress -i
        dh_fixperms -i
        dh_installdeb -i
@@ -197,18 +155,13 @@ binary-indep: build install
        dh_md5sums -i
        dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
        dh_testdir -a
        dh_testroot -a
        dh_installdocs -a
-       dh_installexamples -a
-       dh_installmenu -a
-       dh_installcron -a
-       dh_installinfo -a
-       dh_installchangelogs ChangeLog -a
+       dh_installchangelogs -a
+       dh_lisp -a
        dh_strip -a
-       dh_link -a
        dh_compress -a
        dh_fixperms -a
        dh_installdeb -a
@@ -219,4 +172,5 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean binary-indep binary-arch binary install

diff --git a/doc/Makefile b/doc/Makefile
index a1033c6c32787120c372fa5341961aef134ff38e..05babecda0dab6675663ffe6e74055568a91b782 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -106,7 +106,7 @@ html.tar.gz: $(DOCFILES) Makefile
 fo: ${FOFILE}
 
 ${FOFILE}: $(DOCFILES) Makefile 
-       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output $(FOFILE) fo.xsl $(DOCFILE)
+       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --stringparam fop1.extensions 1 --output $(FOFILE) fo.xsl $(DOCFILE)
 
 .PHONY: pdf
 pdf: ${PDFFILE}