DISTDIR=${PKG}-${VERSION}
DEBDIR=${DEBPKG}-${VERSION}
-# TAG=debian_version_`echo ${DEBVERSION} | tr . _`
-TAG=upstream_version_`echo ${VERSION} | tr . _`
-echo "(re)tagging with release tag '$TAG'"
-cvs -q rtag -d $TAG $PKG > /dev/null
-cvs -q tag -F $TAG > /dev/null
-
+DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
+UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
+echo "(Re-)tagging with Debian tag '${DEB_TAG}'"
+cvs -q rtag -d ${DEB_TAG} ${PKG} > /dev/null
+cvs -q tag -F ${DEB_TAG} > /dev/null
+
+# Retag with upstream tag if release not 0 or 1
+if [ "`echo ${DEBVERSION} | egrep '\-0$\-1$]'`" != "" ]; then
+ echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
+ cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
+ cvs -q tag -F $UPSTREAM_TAG > /dev/null
+fi
# Prepare for archive
cd ..
rm -rf `find ${DISTDIR} -type d -name CVS`
rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*' -or -name '#*#'`
rm -f `find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
- -name \*.log -or -name \*.out -or -name \*.dvi -or -name bp`
+ -name \*.log -or -name \*.out -or -name \*.dvi -or -name copy`
echo "Creating upstream archives"
rm -rf ${DISTDIR}/debian
rm -f ${DEBDIR}/debian/.cvsignore
rm -rf ${DEBDIR}/debian/CVS
-rm -rf ${DEBDIR}
rm -rf ${DISTDIR}
-export CVS_BUILDPACKGE=1
+export CVS_BUILDPACKAGE=1
if [ "${CVS_BUILDPACKAGE}" != "" ]; then
+ rm -rf ${DEBDIR}
mv ${DEBPKG}_${VERSION}.orig.tar.gz /usr/local/src/Packages/${DEBPKG}
- echo "Starting cvs-buildpackage"
- cvsbp
else
cd ${DEBDIR}
echo "Building Debian files"
mkdir -p /usr/local/src/Packages/${DEBPKG}
mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
cd ..
+ rm -rf ${DEBDIR}
fi
cd ${TOPDIR}