r2222: Autocommit for make-debian

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
deleted file mode 100755 (executable)
index ddf4c29..0000000
--- a/cvsbp-prepare.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e  # abort on error
-
-# Clean checked out CVS directory
-rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh
-rm -f `find . -type f -name .cvsignore`
-rm -f stamp-h.in build-stamp configure-stamp
-rm -f debian/cvsbp-prepare.sh

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index c8fc4f80a06d7a7ab9868112d477536b7d02fd11..8986a34b5d356f9f43930981dcbd903150e2d1a4 100755 (executable)
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -5,20 +5,33 @@ set -e
 PKG=clsql
 DEBPKG=cl-sql
 
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-WORK_DIR=/usr/local/src/Work/${PKG}
+BASE_HOME=/usr/local/src
+WORK_HOME=${BASE_HOME}/Work
+WORK_DIR=${WORK_HOME}/${PKG}
+PACKAGE_DIR=${BASE_HOME}/Packages/${DEBPKG}
+SOURCE_DIR=${WORK_HOME}/${PKG}
 
-echo "Building Debian files"
-export CVSROOT=`cat CVS/Root`
-pushd ${WORK_DIR} > /dev/null
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -sa -i -H${WORK_DIR}/debian/cvsbp-prepare.sh $*
+CHANGELOG=changelog
+CHANGELOG=${WORK_DIR}/debian/changelog
+UPSTREAM_VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG}  |head -1`
+DEB_VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG}  |head -1`
+
+DEB_DIR=${WORK_HOME}/${PKG}-${UPSTREAM_VERSION}
+ORIGINAL_TARBALL=${DEBPKG}_${UPSTREAM_VERSION}.orig.tar.gz
+BUILD_LOG=${WORK_HOME}/${DEBPKG}_${DEB_VERSION}_build.log
 
-popd > /dev/null
+if [ -z "${DEB_VERSION}" -o -z "${UPSTREAM_VERSION}" ]; then
+  echo "Error: unable to parse version in changelog file"
+  exit 1
+fi
 
-echo "Checking package with lintian"
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${WORK_DIR}/debian/changelog  |head -1`
-pushd ${PACKAGE_DIR} > /dev/null
-lintian ${DEBPKG}_${DEBVERSION}_*.changes
-popd > /dev/null
+echo "Building Debian files"
+test -s CVS/Root && export CVSROOT=`cat CVS/Root`
+cd ${WORK_DIR}
+cvs com -m 'Autocommit for make-debian'
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -sa -i -H${WORK_DIR}/debian/cvsbp-prepare.sh $* > ${BUILD_LOG}
 
-exit 0
+echo "Checking package"
+test -s ${PACKAGE_DIR}/${DEBPKG}_${DEBVERSION}_*.changes && \
+    (cd ${PACKAGE_DIR}; \ 
+    lintian ${DEBPKG}_${DEBVERSION}_*.changes)

diff --git a/debian/rules b/debian/rules
index 87a0780c69eb94785a5565ec71b09d40101b34b4..8b56685fe92d86f9742ea7032db6d21b37d71a56 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ install: build
        dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
        dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
        dh_install -p $(pkg-pg) $(srcs-pg) $(lispdir-pg)
-       dh_install -p $(pkg-pg-socket) $(srcs-pg) $(lispdir-pg-socket)
+       dh_install -p $(pkg-pg-socket) $(srcs-pg-socket) $(lispdir-pg-socket)
        dh_install -p $(pkg-pg-socket) $(srcs-aodbc) $(lispdir-pg-aodbc)
 
        # CLC Systems