From 21cd6d665b303f493eab5bb9d71e198d704e914d Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 9 Jul 2002 18:14:35 +0000
Subject: [PATCH] r2200: Auto commit for Debian build

---
 debian/make-debian.sh   | 11 +++--------
 debian/make-upstream.sh | 41 +----------------------------------------
 debian/rules            |  4 ++--
 debian/watch            |  2 +-
 4 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 3d4d41b..574fc82 100755
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -10,15 +10,10 @@ DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${WORK_DIR}/debian/changel
 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 -i.cvsignore $*
 cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -i.cvsignore $*
 
-rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
-
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
-fi
+pushd ${PACKAGE_DIR} > /dev/null
+lintian ${DEBPKG}_${DEBVERSION}_*.changes
+popd > /dev/null
 
 exit 0
diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh
index 97c27d8..7711c7c 100755
--- a/debian/make-upstream.sh
+++ b/debian/make-upstream.sh
@@ -5,35 +5,6 @@
 
 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
 
@@ -49,17 +20,7 @@ if [ -z "${VERSION}" ]; then
   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
+cvs commit -m 'Auto commit for Debian build'
 
 if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
diff --git a/debian/rules b/debian/rules
index 46a4969..e934d0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,9 +54,9 @@ lispdir		:= $(prefix)/$(clc-clsql)
 lispdir-sql	:= $(prefix)/$(clc-clsql)/sql
 lispdir-base	:= $(prefix-base)/$(clc-clsql)/base
 lispdir-base-uffi := $(prefix-base)/$(clc-clsql)/interfaces/clsql-uffi
-sodir-base-uffi := $(prefix-base)/usr/lib/cl-sql
+sodir-base-uffi := $(prefix-base)/usr/lib/clsql
 lispdir-mysql	:= $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
-sodir-mysql	:= $(prefix-mysql)/usr/lib/cl-sql
+sodir-mysql	:= $(prefix-mysql)/usr/lib/clsql
 lispdir-pg	:= $(prefix-pg)/$(clc-clsql)/interfaces/postgresql
 lispdir-pg-socket := $(prefix-pg-socket)/$(clc-clsql)/interfaces/postgresql-socket
 lispdir-aodbc	:= $(prefix-aodbc)/$(clc-clsql)/interfaces/aodbc
diff --git a/debian/watch b/debian/watch
index 1d91de5..b68b34c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
-ftp.med-info.com	/pub/clsql	clsql-(.*)\.tar\.gz	debian	uupdate
+clsql.med-info.com	/	clsql-(.*)\.tar\.gz	debian	uupdate
-- 
2.34.1