TOPDIR=`basename $PWD`
VERSION=`cat VERSION`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9]).*/\1/p" < debian/changelog |head -1`
-echo ${DEBVERSION}
-
+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}
-echo "(re)tagging with release tag '$TAG'"
-TAG=debian_version_`echo ${DEBVERSION} | 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 ..
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 \
rm -f ${DEBDIR}/debian/.cvsignore
rm -rf ${DEBDIR}/debian/CVS
-rm -rf ${DEBDIR}
rm -rf ${DISTDIR}
-if [ "${CVS_BUILDPACKAGE}" != "" ]; then
+export CVS_BUILDPACKAGE=1
+if [ "${CVS_BUILDPACKAGE}" == "" ]; then
cd ${DEBDIR}
echo "Building Debian files"
- dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
-
+ 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}"
+mkdir -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