r2200: Auto commit for Debian build

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 3d4d41b03f07d66a2c110583a2cbf3b21cd0d003..574fc823479d9980d19d0e3513f9d60c6f0f0788 100755 (executable)
--- 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 97c27d87383a97ce9a6aefa033f3b597c131a778..7711c7c965865f0ae1262ef17784979cf8f6a9ad 100755 (executable)
--- 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 46a4969e225ed56c64ed7c6011b632c5cad0204d..e934d0a43290750cf7395b8a8f0ecdf11cb4bed3 100755 (executable)
--- 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 1d91de53661f73698e5d91863db430a4ce0e0f4b..b68b34c01cc23b475a13157dfdfccf0c913c0b31 100644 (file)
--- 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