X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=72875c46642e5f342a495df07e99c5ddec724d7f;hb=26c182a47734467abd8658d51d125ada642e0639;hp=cfa257d28739d1079187d6d99e975c46f66ec7c1;hpb=a3baeb803244b00850d6ec0ec82ef95d93ca937e;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index cfa257d..72875c4 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -10,16 +10,22 @@ TOPDIR=`basename $PWD`
 
 VERSION=`cat VERSION`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
-
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-# TAG=debian_version_`echo ${DEBVERSION} | tr . _`
-TAG=upstream_version_`echo ${VERSION} | tr . _`
-echo "(re)tagging with release tag '$TAG'"
-cvs -q rtag -d $TAG $PKG > /dev/null
-cvs -q tag -F $TAG > /dev/null
-
+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 ..
@@ -28,11 +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 {} \;
+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 -or -name bp`
+  -name \*.log -or -name \*.out -or -name \*.dvi`
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
@@ -51,27 +58,25 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-rm -rf ${DEBDIR}
 rm -rf ${DISTDIR}
 
-export CVS_BUILDPACKGE=1
-if [ "${CVS_BUILDPACKAGE}" != "" ]; then
-  mv ${DEBPKG}_${VERSION}.orig.tar.gz /usr/local/src/Packages/${DEBPKG}
-  echo "Starting cvs-buildpackage"
-  cvsbp
-else
+export CVS_BUILDPACKAGE=1
+if [ "${CVS_BUILDPACKAGE}" == "" ]; then
   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 ..
 fi
 
+echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
+kdir -p /usr/local/src/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
+rm -rf ${DEBDIR}
+mv ${DISTDIR}.zip ${PACKAGE_DIR}
+mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
 cd ${TOPDIR}
 
 exit 0