X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=make-dist.sh;h=7c0922f51cd0aa0d8f98a8890b12161f122466f1;hb=8fd93066af42dcd11b1b7b04808ab3474b727b4a;hp=cb93b81b31baa47e2179e25ca44285f1d5349bae;hpb=b621def845ba9db35b7cd33ee1122fd6464675bb;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index cb93b81..7c0922f 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Creates debian and system-independent archive files
+# Programmer: Kevin Rosenberg based on script used by onShore Development
+
 set -e
 
 VERSION=`cat VERSION`
@@ -12,8 +15,8 @@ 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
+cvs -q rtag -d $TAG $PKG
+cvs -q tag -F $TAG
 
 
 # build the tarball
@@ -26,36 +29,37 @@ 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}/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
-
-# Copy dist dir to debian directory
-cp -a ${DISTDIR} ${DEBDIR}
-rm -f ${DEBDIR}/${PKG}.system
-mv ${DEBDIR}/${PKG}.system.debian ${DEBDIR}/${PKG}.system
-
-# Create original distribution archive
-rm -rf ${DISTDIR}/debian ${DISTDIR}/*.system.debian 
+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
 
+# Create original distribution archives
+rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-ln -s ${DISTDIR}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
-find ${DISTDIR} -type f -and -name \*.cl -or -name \*.list -or \
-    -name \*.system -or -name Makefile -or -name ChangeLog -or \
+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 \
+    -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 \
+    -or -name NEWS -or -name *.sgml -or -name COPYING* -or -name catalog \
     | xargs unix2dos
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
-# Create debian source package
-dpkg-source -b ${DEBDIR} ${DEBPKG}_${VERSION}.orig.tar.gz
+cp -a ${TOPDIR}/debian ${DEBDIR}
 
-rm -rf ${DISTDIR}
-rm -rf ${DEBDIR}
-cd ${TOPLEVEL}
+cd ${DEBDIR}
+dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
 
-dpkg-buildpackage -rfakeroot
+cd ..
+rm -rf ${DEBDIR}
+rm -rf ${DISTDIR}
 
+lintian ${DEBPKG}_${VERSION}-*.changes
 
+mkdir -p /usr/local/share/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
+cd ${TOPDIR}
 exit 0