From aecee14abac427c3fe2625516da49eaa2bf40503 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 16 Jul 2002 03:04:29 +0000 Subject: [PATCH] r2211: *** empty log message *** --- cvsbp-prepare.sh => debian/cvsbp-prepare.sh | 3 +- debian/make-debian.sh | 26 ++++++++++ make-upstream.sh => debian/make-upstream.sh | 56 ++++----------------- upload.sh => debian/upload.sh | 15 +++--- make-debian.sh | 21 -------- 5 files changed, 48 insertions(+), 73 deletions(-) rename cvsbp-prepare.sh => debian/cvsbp-prepare.sh (79%) create mode 100755 debian/make-debian.sh rename make-upstream.sh => debian/make-upstream.sh (68%) rename upload.sh => debian/upload.sh (75%) delete mode 100755 make-debian.sh diff --git a/cvsbp-prepare.sh b/debian/cvsbp-prepare.sh similarity index 79% rename from cvsbp-prepare.sh rename to debian/cvsbp-prepare.sh index 1769405..0f81021 100755 --- a/cvsbp-prepare.sh +++ b/debian/cvsbp-prepare.sh @@ -14,7 +14,8 @@ else fi # Clean checked out CVS directory -rm -f upload.sh make-upstream.sh make-debian.sh make-doc.sh do-autoconf cvsbp-prepare.sh +rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh debian/cvsbp-prepare.sh +rm -f make-doc.sh do-autoconf rm -f `find . -type f -name .cvsignore` rm -rf images doc stamp-h.in build-stamp configure-stamp rm -f cvsbp-prepare.sh diff --git a/debian/make-debian.sh b/debian/make-debian.sh new file mode 100755 index 0000000..d9c6d90 --- /dev/null +++ b/debian/make-debian.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +DEBPKG=ctsim + +WORK_HOME=/usr/local/src/Work +PKG_DIR=/usr/local/src/Packages/${DEBPKG} +WORK_DIR=${WORK_HOME}/${PKG} +PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG} + +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` + +export CVSROOT=`cat CVS/Root` + + +echo "Building Debian files" +cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -i"\.pdf|\.htb" -F $* -d ${DEBPKG} -uc -us -sa + +if [ ! -z ${opt_lintian} ]; then + pushd ${PACKAGE_DIR} > /dev/null + lintian ${DEBPKG}_${DEBVERSION}_*.changes + popd > /dev/null +fi + +exit 0 diff --git a/make-upstream.sh b/debian/make-upstream.sh similarity index 68% rename from make-upstream.sh rename to debian/make-upstream.sh index d39aa59..ca36845 100755 --- a/make-upstream.sh +++ b/debian/make-upstream.sh @@ -5,52 +5,20 @@ set -e # abort on error -usage () { - progname="`basename \"$0\"`" - - cat >&2 < /dev/null - cvs -q tag -F $UPSTREAM_TAG > /dev/null -fi +cvs commit -m "Autocommitting for ${VERSION}" if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists." @@ -67,19 +35,18 @@ fi if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then echo "Making documentation" - ../make-doc.sh + ${WORK_DIR}/make-doc.sh fi # Prepare for archive -cd .. rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip -cp -a ${TOPDIR} ${DISTDIR} +cp -a ${WORK_DIR} ${DISTDIR} echo "Cleaning distribution directory ${DISTDIR}" cd ${DISTDIR} make distclean -rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh make-doc.sh +rm -f make-doc.sh rm -f `find . -type f -name .cvsignore` rm -rf `find . -type d -name CVS -or -name .deps` rm -f `find . -type f -name '*~' -or -name '.#*' -or -name '#*#' -or -name ".*~" -or -name "*.o" -or -name "*.a"` @@ -112,7 +79,7 @@ if [ "${DISTDIR}" == "${DEBDIR}" ]; then fi GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR} -cp -a ${TOPDIR}/debian ${DEBDIR} +cp -a ${WORK_DIR}/debian ${DEBDIR} rm -f ${DEBDIR}/debian/.cvsignore rm -rf ${DEBDIR}/debian/CVS @@ -123,5 +90,4 @@ mkdir -p /usr/local/src/Packages/${DEBPKG} rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR} -cd ${TOPDIR} exit 0 diff --git a/upload.sh b/debian/upload.sh similarity index 75% rename from upload.sh rename to debian/upload.sh index 4b5cec4..fbb18de 100755 --- a/upload.sh +++ b/debian/upload.sh @@ -33,10 +33,14 @@ 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` +WORK_HOME=/usr/local/src/Work +PKG_DIR=/usr/local/src/Packages/${DEBPKG} +WORK_DIR=${WORK_HOME}/${PKG} +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 /usr/local/src/Packages/${DEBPKG} > /dev/null +pushd ${PKG_DIR} > /dev/null FTP_DIR=ftp.med-info.com:/home/ftp/pub/${PKG} if [ "${opt_upstream}" == "1" ]; then @@ -47,7 +51,7 @@ if [ "${opt_upstream}" == "1" ]; then fi echo "Uploading to Debian site" -DEBIAN_DIR=ftp.med-info.com:/home/ftp/pub/UploadQueue +DEBIAN_DIR=ftp.med-info.com:/home/ftp/pub/debian/UploadQueue if [ "${opt_upstream}" == "1" ]; then echo "...Uploading original upstream archive" @@ -57,8 +61,7 @@ scp ${DEBPKG}*_${DEBVERSION}_*.deb ${FTP_DIR}/linux-debian/. scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR} scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR} scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR} -scp ${DEBPKG}-doc_${DEBVERSION}_*.deb ${DEBIAN_DIR} -scp ${DEBPKG}-help_${DEBVERSION}_*.deb ${DEBIAN_DIR} +scp ${DEBPKG}-{doc,help}_${DEBVERSION}_*.deb ${DEBIAN_DIR} scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last popd > /dev/null diff --git a/make-debian.sh b/make-debian.sh deleted file mode 100755 index 7e3441d..0000000 --- a/make-debian.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -DEBPKG=ctsim -DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog |head -1` -TOPDIR=`pwd` -PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG} - -export CVSROOT=`cat CVS/Root` - -echo "Building Debian files" -cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare.sh -i"\.pdf|\.htb" -F $* -d ${DEBPKG} -uc -us -sa - -rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION} - -if [ ! -z ${opt_lintian} ]; then - pushd ${PACKAGE_DIR} > /dev/null - lintian ${DEBPKG}_${DEBVERSION}_*.changes - popd > /dev/null -fi - -exit 0 -- 2.34.1