r1962: *** empty log message ***

[uffi.git] / make-upstream.sh

diff --git a/make-upstream.sh b/make-upstream.sh
index e83d933284e7094291ffcd5cde1a342d9bdcaf3b..80e720b6152458d0d4b0b64a27e52d8041a6e3fd 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -32,25 +32,18 @@ DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`pwd`
 
-VERSION=`cat VERSION`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
+
 PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
 if [ ! -z ${opt_tag} ]; then
-  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
+    UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
     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
+
 fi
 # Prepare for archive
 cd ..