r2203: *** empty log message ***

[clsql.git] / debian / make-debian.sh

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 3d4d41b03f07d66a2c110583a2cbf3b21cd0d003..50f41a1d31be42185da5368858419f40dd82b61a 100755 (executable)
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -1,24 +1,23 @@
 #!/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`
-
 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}
+export CVSROOT=`cat CVS/Root`
+pushd ${WORK_DIR} > /dev/null
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -sa -i.cvsignore $*
+popd > /dev/null
 
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
-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
 
 exit 0