+++ /dev/null
-#!/bin/bash
-
-set -e # abort on error
-
-echo "Cleaning checkout CVS directory"
-rm -f upload.sh make-upstream.sh make-debian.sh
-rm -f `find . -type f -name .cvsignore`
-rm -f cvsbp-prepare.sh
-
-cl-sql (0.7.3-2) unstable; urgency=low
+cl-sql (0.7.4-1) unstable; urgency=low
+ * Rework upstream source to put html documentation in html.tar.gz
* Move .so files into /usr/lib/cl-sql directory
* Move documentation into the clsql-base package
--- /dev/null
+#!/bin/bash
+
+set -e # abort on error
+
+echo "Cleaning checkout CVS directory"
+rm -f `find . -type f -name .cvsignore`
+
--- /dev/null
+#!/bin/bash
+
+PKG=clsql
+DEBPKG=cl-sql
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
+WORK_DIR=/usr/local/src/Work/${PKG}
+
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${WORK_DIR}/debian/changelog |head -1`
+
+export CVSROOT=`cat CVS/Root`
+
+echo "Building Debian files"
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -F -d ${DEBPKG} -uc -us $*
+
+rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
+
+if [ ! -z ${opt_lintian} ]; then
+ pushd ${PACKAGE_DIR} > /dev/null
+ lintian ${DEBPKG}_${DEBVERSION}_*.changes
+ popd > /dev/null
+fi
+
+exit 0
--- /dev/null
+#!/bin/bash
+#
+# Creates upstream packages
+# Programmer: Kevin Rosenberg
+
+set -e # abort on error
+
+usage () {
+ progname="`basename \"$0\"`"
+
+ cat >&2 <<EOF
+Usage: $progname [options]
+Creates upstream archives
+Options:
+ -c Commit and tag CVS tree with current version numbers
+ -t Tag CVS tree with current version numbers
+ -f Force creation of upstream archive, even if exists'
+ -h Print this brief help
+EOF
+}
+
+opt_force=0
+
+# Command line
+while [ $# != 0 ]; do
+ value="`echo x\"$1\" | sed -e 's/^x-.//'`"
+ case "$1" in
+ -h) usage; exit 0 ;;
+ -c) opt_commit=1; opt_tag=1 ;;
+ -t) opt_tag=1 ;;
+ -f) opt_force=1 ;;
+ *) usage; exit 0 ;;
+ esac
+ shift
+done
+
+PKG=clsql
+DEBPKG=cl-sql
+
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
+WORK_DIR=/usr/local/src/Work/${PKG}
+DISTDIR=${PKG}-${VERSION}
+DEBDIR=${DEBPKG}-${VERSION}
+
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${WORK_DIR}/debian/changelog |head -1`
+if [ -z "${VERSION}" ]; then
+ echo "Can't find Debian changelog"
+ exit 1
+fi
+
+if [ ! -z ${opt_commit} ]; then
+ cvs commit -m 'Auto commit for Debian build'
+fi
+
+if [ ! -z ${opt_tag} ]; then
+ UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
+ echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
+ cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
+ cvs -q tag -F $UPSTREAM_TAG > /dev/null
+
+fi
+
+if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
+ echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
+ echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
+ read answer
+ case $answer in
+ [Yy]*) nop= ;;
+ *) echo "Not building"
+ exit 1
+ ;;
+ esac
+fi
+
+# Prepare for archive
+cd ${WORK_DIR}/..
+rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
+rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
+cp -a ${WORK_DIR} ${DISTDIR}
+
+echo "Cleaning distribution directory ${DISTDIR}"
+cd ${DISTDIR}
+rm -f debian/upload.sh debian/make-debian.sh debian/make-upstream.sh debian/cvsbp-prepare.sh test-suite/test.config
+rm -f `find . -type f -name "*.so" -or -name "*.o"`
+rm -f `find . -type f -name .cvsignore`
+rm -rf `find . -type d -name CVS -or -name .bin`
+rm -f `find . -type f -name '*~' -or -name '.#*' -or -name '#*#' -or -name ".*~"`
+rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
+ -name \*.log -or -name \*.out -or -name \*.dvi`
+cd ..
+
+echo "Creating upstream archives"
+rm -rf ${DISTDIR}/debian
+GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
+
+cp -a ${DISTDIR} ${DEBDIR}
+GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
+
+unix2dos `find ${DISTDIR} -type f -name \*.cl -or -name \*.list -or \
+ -name \*.system -or -name Makefile -or -name ChangeLog -or \
+ -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL -or \
+ -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog`
+zip -rq ${DISTDIR}.zip ${DISTDIR}
+
+cp -a ${WORK_DIR}/debian ${DEBDIR}
+rm -f ${DEBDIR}/debian/.cvsignore
+rm -rf ${DEBDIR}/debian/CVS
+
+rm -rf ${DISTDIR} ${DEBDIR}
+
+echo "Moving upstream archives to ${PACKAGE_DIR}"
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
+mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
+cd ${WORK_DIR}
+exit 0
$(INSTALL) $(INSTALLFLAGS) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/test-suite
# Documentation
+ rm -rf doc/html
+ tar xzf doc/html.tar.gz
$(INSTALL) $(INSTALLFLAGS) doc/html/* $(doc-dir)/html
+ rm -rf doc/html
cp doc/clsql.pdf doc/cl-sql.pdf
rm -f doc/cl-sql.pdf.gz
gzip doc/cl-sql.pdf
--- /dev/null
+#!/bin/sh
+
+set -e # abort on error
+
+PKG=clsql
+DEBPKG=cl-sql
+
+
+WORK_DIR=/usr/local/src/Work/${PKG}
+PKG_DIR=/usr/local/src/Packages/${DEBPKG}
+
+UPSTREAM_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}/.
+FTP_DEBDIR=ftp.med-info.com:/home/ftp/pub/debian/UploadQueue
+
+
+usage () {
+ progname="`basename \"$0\"`"
+
+ cat >&2 <<EOF
+Usage: $progname [options]
+Creates upstream archives
+Options:
+ -u Upload only upstream packages
+ -d Upload only debian packages
+ -h Print this brief help
+EOF
+}
+
+opt_debian=1
+opt_upstream=1
+
+# Command line
+while [ $# != 0 ]; do
+ value="`echo x\"$1\" | sed -e 's/^x-.//'`"
+ case "$1" in
+ -h) usage; exit 0 ;;
+ -u) opt_debian=0 ;;
+ -d) opt_upstream=0 ;;
+ *) usage; exit 0 ;;
+ esac
+ shift
+done
+
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog |head -1`
+
+pushd ${PKG_DIR} > /dev/null
+
+if [ "${opt_upstream}" == "1" ]; then
+ echo "Uploading upstream files to web site"
+ scp ${PKG}-${VERSION}.tar.gz ${UPSTREAM_DIR}
+ scp ${PKG}-${VERSION}.zip ${UPSTREAM_DIR}
+ ssh ftp.med-info.com "(cd /opt/apache/htdocs/${PKG}.med-info.com; make)" &
+fi
+
+echo "Uploading to Debian site"
+
+if [ "${opt_upstream}" == "1" ]; then
+ echo "...Uploading original upstream archive"
+ scp ${DEBPKG}_${VERSION}.orig.tar.gz ${FTP_DEBDIR}
+fi
+scp ${DEBPKG}_${DEBVERSION}.diff.gz ${FTP_DEBDIR}
+scp ${DEBPKG}_${DEBVERSION}.dsc ${FTP_DEBDIR}
+scp ${DEBPKG}_${DEBVERSION}_*.deb ${FTP_DEBDIR}
+scp ${DEBPKG}-*_${DEBVERSION}_*.deb ${FTP_DEBDIR}
+scp ${DEBPKG}_${DEBVERSION}_*.changes ${FTP_DEBDIR} # upload last
+
+popd > /dev/null
+
+
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
-;;;; $Id: clsql-uffi-loader.cl,v 1.13 2002/05/17 17:09:55 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.14 2002/07/08 17:37:18 kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
`(,(directory-namestring
(translate-logical-pathname
"CL-LIBRARY:clsql;interfaces;clsql-uffi;"))
- "/usr/share/common-lisp/source/clsql/interfaces/clsql-uffi/")
+ "/usr/lib/cl-sql/")
:drive-letters '("C" "D" "E" "F" "G")))
(defvar *clsql-uffi-supporting-libraries* '("c")
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: mysql-loader.cl,v 1.18 2002/05/27 17:19:30 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.19 2002/07/08 17:37:18 kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
`(,(directory-namestring
(translate-logical-pathname
"CL-LIBRARY:clsql;interfaces;mysql;"))
- "/usr/share/common-lisp/source/clsql/interfaces/mysql/")
+ "/usr/lib/cl-sql/")
:drive-letters '("C" "D" "E" "F" "G")))
(defvar *mysql-library-filename*
+++ /dev/null
-#!/bin/bash
-
-DEBPKG=cl-sql
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog |head -1`
-TOPDIR=`pwd`
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-
-export CVSROOT=`cat CVS/Root`
-
-echo "Building Debian files"
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare.sh -i.pdf -F -d ${DEBPKG} -uc -us $*
-
-rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
-
-if [ ! -z ${opt_lintian} ]; then
- pushd ${PACKAGE_DIR} > /dev/null
- lintian ${DEBPKG}_${DEBVERSION}_*.changes
- popd > /dev/null
-fi
-
-exit 0
+++ /dev/null
-#!/bin/bash
-#
-# Creates upstream packages
-# Programmer: Kevin Rosenberg
-
-set -e # abort on error
-
-usage () {
- progname="`basename \"$0\"`"
-
- cat >&2 <<EOF
-Usage: $progname [options]
-Creates upstream archives
-Options:
- -c Commit and tag CVS tree with current version numbers
- -t Tag CVS tree with current version numbers
- -f Force creation of upstream archive, even if exists'
- -h Print this brief help
-EOF
-}
-
-opt_force=0
-
-# Command line
-while [ $# != 0 ]; do
- value="`echo x\"$1\" | sed -e 's/^x-.//'`"
- case "$1" in
- -h) usage; exit 0 ;;
- -c) opt_commit=1; opt_tag=1 ;;
- -t) opt_tag=1 ;;
- -f) opt_force=1 ;;
- *) usage; exit 0 ;;
- esac
- shift
-done
-
-DEBPKG=cl-sql
-PKG=clsql
-TOPDIR=`pwd`
-
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1`
-
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-DISTDIR=${PKG}-${VERSION}
-DEBDIR=${DEBPKG}-${VERSION}
-
-if [ ! -z ${opt_commit} ]; then
- cvs commit -m 'Debian build'
-fi
-
-if [ ! -z ${opt_tag} ]; then
- UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
- echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
- cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
- cvs -q tag -F $UPSTREAM_TAG > /dev/null
-
-fi
-
-if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
- echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
- echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
- read answer
- case $answer in
- [Yy]*) nop= ;;
- *) echo "Not building"
- exit 1
- ;;
- esac
-fi
-
-# Prepare for archive
-cd ..
-rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
-rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
-cp -a ${TOPDIR} ${DISTDIR}
-
-echo "Cleaning distribution directory ${DISTDIR}"
-cd ${DISTDIR}
-rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh test-suite/test.config
-rm -f `find . -type f -name "*.so" -or -name "*.o"`
-rm -f `find . -type f -name .cvsignore`
-rm -rf `find . -type d -name CVS -or -name .bin`
-rm -f `find . -type f -name '*~' -or -name '.#*' -or -name '#*#' -or -name ".*~"`
-rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
- -name \*.log -or -name \*.out -or -name \*.dvi`
-cd ..
-
-echo "Creating upstream archives"
-rm -rf ${DISTDIR}/debian
-GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
-
-cp -a ${DISTDIR} ${DEBDIR}
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
-
-unix2dos `find ${DISTDIR} -type f -name \*.cl -or -name \*.list -or \
- -name \*.system -or -name Makefile -or -name ChangeLog -or \
- -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL -or \
- -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog`
-zip -rq ${DISTDIR}.zip ${DISTDIR}
-
-cp -a ${TOPDIR}/debian ${DEBDIR}
-rm -f ${DEBDIR}/debian/.cvsignore
-rm -rf ${DEBDIR}/debian/CVS
-
-rm -rf ${DISTDIR} ${DEBDIR}
-
-echo "Moving upstream archives to ${PACKAGE_DIR}"
-mkdir -p /usr/local/src/Packages/${DEBPKG}
-rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
-mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
-
-cd ${TOPDIR}
-exit 0
+++ /dev/null
-#!/bin/sh
-
-PKG=clsql
-DEBPKG=cl-sql
-
-set -e # abort on error
-
-usage () {
- progname="`basename \"$0\"`"
-
- cat >&2 <<EOF
-Usage: $progname [options]
-Creates upstream archives
-Options:
- -u Upload only upstream packages
- -d Upload only debian packages
- -h Print this brief help
-EOF
-}
-
-opt_debian=1
-opt_upstream=1
-
-# Command line
-while [ $# != 0 ]; do
- value="`echo x\"$1\" | sed -e 's/^x-.//'`"
- case "$1" in
- -h) usage; exit 0 ;;
- -u) opt_debian=0 ;;
- -d) opt_upstream=0 ;;
- *) usage; exit 0 ;;
- esac
- shift
-done
-
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog |head -1`
-
-pushd /usr/local/src/Packages/${DEBPKG} > /dev/null
-
-if [ "${opt_upstream}" == "1" ]; then
- echo "Uploading upstream files to web site"
- UPSTREAM_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}/.
- scp ${PKG}-${VERSION}.tar.gz ${UPSTREAM_DIR}
- scp ${PKG}-${VERSION}.zip ${UPSTREAM_DIR}
- ssh ftp.med-info.com "(cd /opt/apache/htdocs/${PKG}.med-info.com; make)" &
-fi
-
-echo "Uploading to Debian site"
-DEBIAN_DIR=ftp.med-info.com:/home/ftp/pub/debian/UploadQueue
-
-if [ "${opt_upstream}" == "1" ]; then
- echo "...Uploading original upstream archive"
- scp ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBIAN_DIR}
-fi
-scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
-scp ${DEBPKG}-*_${DEBVERSION}_*.deb ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
-
-popd > /dev/null
-
-
projects / clsql.git / commitdiff