X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=757695e08c601df4812dabfdc8717299a219139b;hb=fc7552128575d89debce4f4e32705efd26dfddc1;hp=7b31048f2b41b2fbad61e68deb55ce8fec49133b;hpb=9c2495478c794d58dfa5c05939ffbcff077aa6c4;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 7b31048..757695e 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -35,7 +35,7 @@ DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`pwd`
 
-VERSION=`cat VERSION`
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9]).*/\1/p" < debian/changelog  |head -1`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
 PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
@@ -66,10 +66,10 @@ rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
-rm -f ${DISTDIR}/upload.sh ${DISTDIR}/make-dist.sh
+rm -f ${DISTDIR}/upload.sh ${DISTDIR}/make-dist.sh  ${DISTDIR}/cvsbp-prepare 
 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} -type f -name '*~' -or -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`
 
@@ -92,25 +92,24 @@ rm -rf ${DEBDIR}/debian/CVS
 
 rm -rf ${DISTDIR}
 
+echo "Moving upstream archives to ${PACKAGE_DIR}"
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
+mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
+echo "Building Debian files"
 if [ -z ${opt_dpkg_buildpackage} ]; then
   cd ${TOPDIR}
-  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 ${DEBPKG}
   cd ..
 else
   cd ${DEBDIR}
-  echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
+  mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
   cd ..
 fi
-
 rm -rf ${DEBDIR}
 
-echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
-mkdir -p /usr/local/src/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
-mv ${DISTDIR}.zip ${PACKAGE_DIR}
-mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
-
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null
   lintian ${DEBPKG}_${DEBVERSION}_*.changes