X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=fbad02e8fbebdd9c6d9cb99a799474898fae8b9f;hb=de8fba51c339518b79a06292eaef1d8cbb876fba;hp=71d58e1a53b4763d1d85360395757ecce00c83fe;hpb=81fac29946d696e050cf991a7f5ce31eaa84be0a;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 71d58e1..fbad02e 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -x
 
 # Creates debian and system-independent archive files
 # Programmer: Kevin Rosenberg based on script used by onShore Development
@@ -14,9 +14,9 @@ DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
 TAG=upstream_version_`echo $VERSION | tr . _`
-echo "(re)tagging with release tag '$TAG'"
-cvs -q rtag -d $TAG $PKG
-cvs -q tag -F $TAG
+#echo "(re)tagging with release tag '$TAG'"
+#cvs -q rtag -d $TAG $PKG
+#cvs -q tag -F $TAG
 
 
 # build the tarball
@@ -27,18 +27,17 @@ rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
 # Remove junk from distribution dir
-find ${DISTDIR} -type f -name .cvsignore -exec rm {} \;
-find ${DISTDIR} -type d -name CVS | xargs rm -r
+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 -or \
-    -name *~ -or -name ".#*"  -or -name "#*#" |xargs rm -f
+    -name *.log -or -name *.out -or -name *.dvi | xargs rm -f
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
 cp -a ${DISTDIR} ${DEBDIR}
-# rm -f ${DEBDIR}/debian/.cvsignore
 GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
 find ${DISTDIR} -type f -and -name *.cl -or -name *.list -or \
@@ -49,6 +48,8 @@ find ${DISTDIR} -type f -and -name *.cl -or -name *.list -or \
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
 cp -a ${TOPDIR}/debian ${DEBDIR}
+rm -f ${DEBDIR}/debian/.cvsignore 
+rm -rf ${DEBDIR}/debian/CVS
 
 cd ${DEBDIR}
 dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
@@ -59,7 +60,7 @@ rm -rf ${DISTDIR}
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
-mkdir -p /usr/local/share/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
 cd ${TOPDIR}
 exit 0