r1962: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index 061e6a964029c04286d5aae25f9ce66c29669911..9db892a94d5c274eeeea419800ad3da14f6cbb7d 100644 (file)
--- 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 838a9773b692c44fbcf27eab1f0702ab295cf500..9b522d4e44054e90a19413b8b947069a8eee7314 100644 (file)
--- 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 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 ..