X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=9dbc73bfdebba660550816936c22e301de5579fc;hb=aa269788e108d3b8861aad5cb5a7b28278677cdf;hp=7aaa901685d486e9eec8402d3e481b03bcd35c0d;hpb=19ea0e4a4a8ad89d06311d4e69fe2185a18d4590;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 7aaa901..9dbc73b 100755
--- 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 ${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
+  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 ..
@@ -25,12 +34,12 @@ rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
-find ${DISTDIR} -type f -name .cvsignore -exec rm -f {} \;
-find ${DISTDIR} -type d -name CVS | xargs rm -rf
-find ${DISTDIR} -type f -name '*~' -or -name '#*'  -or -name '#*#' \
-    -exec rm -f {} \;
-find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
-    -name \*.log -or -name \*.out -or -name \*.dvi -exec rm -f {} \;
+rm -f ${DISTDIR}/upload.sh
+rm -f `find ${DISTDIR} -type f -name .cvsignore`
+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`
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
@@ -39,30 +48,36 @@ GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 cp -a ${DISTDIR} ${DEBDIR}
 GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
-find ${DISTDIR} -type f -name \*.cl -or -name \*.list -or \
+unix2dos `find ${DISTDIR} -type f -name \*.cl -or -name \*.list -or \
     -name \*.system -or -name Makefile -or -name ChangeLog -or \
     -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL -or \
-    -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog \
-    -exec unix2dos {} \;
+    -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog`
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
 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