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

diff --git a/make-dist.sh b/make-dist.sh
index cfa257d..22acd2b 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -14,12 +14,18 @@ DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1
 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'"
+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
 
+# 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 ..
@@ -51,14 +57,12 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 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"
@@ -70,6 +74,7 @@ else
   mkdir -p /usr/local/src/Packages/${DEBPKG}
   mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
   cd ..
+  rm -rf ${DEBDIR}
 fi
 
 cd ${TOPDIR}