From 9c238b1bf446d204ef91ddbba49050c2cc6e943d Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 6 May 2002 03:12:06 +0000
Subject: [PATCH] r1962: *** empty log message ***

---
 debian/changelog |  6 ++++++
 make-debian.sh   | 11 +++++++----
 make-upstream.sh | 15 ++++-----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 061e6a9..9db892a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (0.4.5-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Kevin Rosenberg <kevin@cheetah-debian.med-info.com>  Sun,  5 May 2002 21:10:13 -0600
+
 cl-uffi (0.4.4-8) unstable; urgency=low
 
   * Improved control file in anticipation of having dpkg-buildpackage
diff --git a/make-debian.sh b/make-debian.sh
index 838a977..9b522d4 100644
--- a/make-debian.sh
+++ b/make-debian.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
 
-if [ -z ${opt_dpkg_buildpackage} ]; then
-  export CVSROOT=`cat CVS/Root`
-fi
+DEBPKG=cl-uffi
+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 -tC -i.pdf ${DEBPKG}
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf -F ${DEBPKG}
 
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null
diff --git a/make-upstream.sh b/make-upstream.sh
index e83d933..80e720b 100755
--- 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 ..
-- 
2.34.1