r1913: *** empty log message ***

[uffi.git] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index 2b721dd77e5f75699ed74eab53f94fd8754befdf..22acd2bf0e21a69ccb59cebc426e942bf7adedda 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -4,19 +4,28 @@
 
 set -e
 
-VERSION=`cat VERSION`
 DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`basename $PWD`
 
+VERSION=`cat VERSION`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
+
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-#echo "(re)tagging with release tag '$TAG'"
-#TAG=upstream_version_`echo $VERSION | tr . _`
-#cvs -q rtag -d $TAG $PKG
-#cvs -q tag -F $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 ..
@@ -29,7 +38,7 @@ find ${DISTDIR} -type f -name .cvsignore -exec rm -f {} \;
 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`
+  -name \*.log -or -name \*.out -or -name \*.dvi -or -name bp`
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
@@ -48,20 +57,26 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-cd ${DEBDIR}
-echo "Building Debian files"
-dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
-
-cd ..
-rm -rf ${DEBDIR}
 rm -rf ${DISTDIR}
 
-echo "Checking Debian Files"
-lintian ${DEBPKG}_${VERSION}-*.changes
+export CVS_BUILDPACKAGE=1
+if [ "${CVS_BUILDPACKAGE}" != "" ]; then
+  rm -rf ${DEBDIR}
+  mv ${DEBPKG}_${VERSION}.orig.tar.gz /usr/local/src/Packages/${DEBPKG}
+else
+  cd ${DEBDIR}
+  echo "Building Debian files"
+  dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
+  echo "Checking Debian Files"
+  lintian ${DEBPKG}_${VERSION}-*.changes
+
+  echo "Moving Debian Files to /usr/local/src/Packages/${DEBPKG}"
+  mkdir -p /usr/local/src/Packages/${DEBPKG}
+  mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
+  cd ..
+  rm -rf ${DEBDIR}
+fi
 
-echo "Moving Debian Files to /usr/local/src/Packages/${DEBPKG}"
-mkdir -p /usr/local/src/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
 cd ${TOPDIR}
 
 exit 0