r1820: further debian improvements

[uffi.git] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index fdf21ea5069b0b8b8994027dcb9784bb55eb00d8..cb93b81b31baa47e2179e25ca44285f1d5349bae 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -6,39 +6,56 @@ VERSION=`cat VERSION`
 DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`basename $PWD`
-DISTDIR=${PKG}-${VERSION}
 
-# first we clean everything up
-echo "cleaning $PKG up for packaging"
-make distclean
+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
+#cvs -q rtag -d $TAG $PKG
+#cvs -q tag -F $TAG
 
 
 # build the tarball
 echo "building tarballs"
-(   cd ..
-    rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
-    rm -rf ${DISTDIR} ${DEBPKG}-${VERSION} ${DISTDIR}.zip
-    cp -a ${TOPDIR} ${DISTDIR}
-    find $(PKG}-${VERSION} -type f -name .cvsignore -exec rm {} \;
-    find $(PKG)-${VERSION}/doc -type f -name \*.tex -or -name \*.aux -or \
-       -name \*.log -or -name \*.out -or -name \*.dvi -or \
-       -name \*~ -exec rm {} \;
-    cp -a ${DISTDIR} ${DEBPKG}-${VERSION}
-    rm -rf ${DISTDIR}/debian
-    GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
-
-    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
-    @zip -rq ${DISTDIR}.zip ${DISTDIR}
-    rm -rf ${DISTDIR}
-)
+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
+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 
+
+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 \
+    -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
+zip -rq ${DISTDIR}.zip ${DISTDIR}
+
+# Create debian source package
+dpkg-source -b ${DEBDIR} ${DEBPKG}_${VERSION}.orig.tar.gz
+
+rm -rf ${DISTDIR}
+rm -rf ${DEBDIR}
+cd ${TOPLEVEL}
+
+dpkg-buildpackage -rfakeroot
+
 
 exit 0