r1830: debian fixes

[uffi.git] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index 8bb25929b4731fe060a3c969d0f39ccfe9f1a1c2..2161cde3ffd7e7c3ea45813b8bb72b1dcbf9cee9 100755 (executable)
--- 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
@@ -30,17 +33,13 @@ 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
 
-# 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 
-
+# Create original distribution archives
+rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-cp ${DISTDIR}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
+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 \
@@ -48,16 +47,16 @@ find ${DISTDIR} -type f -and -name \*.cl -or -name \*.list -or \
     | xargs unix2dos
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
+cp -a ${TOPDIR}/debian ${DEBDIR}
 
-cp ${TOPDIR}/${PKG}.system.debian ${DEBDIR}
 cd ${DEBDIR}
-dpkg-buildpackage -rfakeroot -kkevin@b9.com
+dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
 
 cd ..
-rm -rf ${DISTDIR}
-rm -rf ${DEBDIR}
+#rm -rf ${DEBDIR}
+#rm -rf ${DISTDIR}
 
-lintian ${PKG}_${VERSION}-*.changes
+lintian ${DEBPKG}_${VERSION}-*.changes
 
 cd ${TOPDIR}
 exit 0