r1872: *** empty log message ***

diff --git a/make-dist.sh b/make-dist.sh
index fbad02e8fbebdd9c6d9cb99a799474898fae8b9f..7aaa901685d486e9eec8402d3e481b03bcd35c0d 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,7 +1,6 @@
-#!/bin/bash -x
-
-# Creates debian and system-independent archive files
-# Programmer: Kevin Rosenberg based on script used by onShore Development
+#!/bin/bash 
+# Creates debian and upstream packages
+# Programmer: Kevin Rosenberg
 
 set -e
 
@@ -13,38 +12,38 @@ TOPDIR=`basename $PWD`
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-TAG=upstream_version_`echo $VERSION | tr . _`
 #echo "(re)tagging with release tag '$TAG'"
+#TAG=upstream_version_`echo $VERSION | tr . _`
 #cvs -q rtag -d $TAG $PKG
 #cvs -q tag -F $TAG
 
 
-# build the tarball
-echo "building tarballs"
+# Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
 rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
-# Remove junk from distribution dir
+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 \#*\# |xargs rm -f
-find ${DISTDIR}/doc -type f -name *.tex -or -name *.aux -or \
-    -name *.log -or -name *.out -or -name *.dvi | xargs rm -f
+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 {} \;
 
-# Create original distribution archives
+echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
 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 -and -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 \
-    | xargs 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 {} \;
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
 cp -a ${TOPDIR}/debian ${DEBDIR}
@@ -52,14 +51,17 @@ 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
 
+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}