r2201: *** empty log message ***

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

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 7192045a1fd469c211a337ac191559a833b555a6..d9e87bacc147e99bbfe24d70c04098f11a6d955a 100755 (executable)
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -2,22 +2,18 @@
 
 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 $*
-
-rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
+export CVSROOT=`cat CVS/Root`
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -sa -i.cvsignore $*
 
-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