From 84c62eec2a8bb648e9e93d049656b6f91b6769b4 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 9 Jul 2002 18:18:54 +0000 Subject: [PATCH] r2201: *** empty log message *** --- debian/make-debian.sh | 10 +++++----- debian/upload.sh | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/make-debian.sh b/debian/make-debian.sh index 574fc82..d9e87ba 100755 --- 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 a739e83..326ea34 100755 --- 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 -- 2.34.1