r2201: *** empty log message ***

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

diff --git a/debian/upload.sh b/debian/upload.sh
index a739e83857027106eae6c6ff2f3adb551fe2a8af..326ea34a382c2aec7bed79b3e5f4735d5578998f 100755 (executable)
--- a/debian/upload.sh
+++ b/debian/upload.sh
@@ -12,7 +12,6 @@ PKG_DIR=/usr/local/src/Packages/${DEBPKG}
 UPSTREAM_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}/.
 FTP_DEBDIR=ftp.med-info.com:/home/ftp/pub/debian/UploadQueue
 
-
 usage () {
     progname="`basename \"$0\"`"
     
@@ -41,8 +40,9 @@ while [ $# != 0 ]; do
     shift
 done
 
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
+CHANGELOG=${WORK_DIR}/debian/changelog
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG}  |head -1`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG}  |head -1`
 
 pushd ${PKG_DIR} > /dev/null