X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Fmake-debian.sh;h=8e7a9403b35b15fd96489990990583aee43eb084;hb=1df414c90e81e72b3f21c69db7c1b7bf42d73f4b;hp=3d4d41b03f07d66a2c110583a2cbf3b21cd0d003;hpb=6dee351e6d20e21a11c78ec9971ec07845b0d03e;p=clsql.git

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 3d4d41b..8e7a940 100755
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -1,24 +1,37 @@
 #!/bin/bash
 
+set -e
+
 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`
+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"
-#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 $*
+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`
 
-rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
+DEB_DIR=${WORK_HOME}/${PKG}-${UPSTREAM_VERSION}
+ORIGINAL_TARBALL=${DEBPKG}_${UPSTREAM_VERSION}.orig.tar.gz
+BUILD_LOG=${WORK_HOME}/${DEBPKG}_${DEB_VERSION}_build.log
 
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
+if [ -z "${DEB_VERSION}" -o -z "${UPSTREAM_VERSION}" ]; then
+  echo "Error: unable to parse version in changelog file"
+  exit 1
 fi
 
-exit 0
+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} 2>&1
+
+echo "Checking package"
+test -s ${PACKAGE_DIR}/${DEBPKG}_${DEBVERSION}_*.changes && \
+    (cd ${PACKAGE_DIR}; \ 
+    lintian ${DEBPKG}_${DEBVERSION}_*.changes)