X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=9dbc73bfdebba660550816936c22e301de5579fc;hb=aa269788e108d3b8861aad5cb5a7b28278677cdf;hp=22acd2bf0e21a69ccb59cebc426e942bf7adedda;hpb=5e157ed9cef7cee901eebc373fb96e3be6a81de5;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 22acd2b..9dbc73b 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -16,13 +16,13 @@ DEBDIR=${DEBPKG}-${VERSION}
 
 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 $TAG $PKG > /dev/null
-cvs -q tag -F $TAG > /dev/null
+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}'"
+  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
@@ -34,11 +34,12 @@ rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
-find ${DISTDIR} -type f -name .cvsignore -exec rm -f {} \;
+rm -f ${DISTDIR}/upload.sh
+rm -f `find ${DISTDIR} -type f -name .cvsignore`
 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`
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian