r1918: *** empty log message ***

[uffi.git] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index 135cbcd3a261430c0df19ba3e809a97938832087..72875c46642e5f342a495df07e99c5ddec724d7f 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -10,7 +10,7 @@ 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}
 
@@ -34,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
@@ -60,23 +61,22 @@ rm -rf ${DEBDIR}/debian/CVS
 rm -rf ${DISTDIR}
 
 export CVS_BUILDPACKAGE=1
-if [ "${CVS_BUILDPACKAGE}" != "" ]; then
-  rm -rf ${DEBDIR}
-  mv ${DEBPKG}_${VERSION}.orig.tar.gz /usr/local/src/Packages/${DEBPKG}
-else
+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 ..
-  rm -rf ${DEBDIR}
 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