r1830: debian fixes

diff --git a/debian/changelog b/debian/changelog
index 47e120f456e9d25149a14939fc12d112ee86e496..7dcc9d5e08d11571a3632cde37496313232b2711 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (0.4.4-3) unstable; urgency=low
+
+  * Modified make-dist.sh  to create better .diff.gz
+
+ -- Kevin Rosenberg <kevin@pal.med-info.com>  Sun, 28 Apr 2002 06:38:48 -0600
+
 cl-uffi (0.4.4-2) unstable; urgency=low
 
   * Improved source code archive for debian upload

diff --git a/doc/Makefile b/doc/Makefile
index 67cd9c025a17816c26725752955ec9ac118f6d21..bec9e878f53643ee5102e1b5e502042281c35abf 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.21 2002/04/28 09:37:40 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.22 2002/04/28 13:52:30 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -61,10 +61,7 @@ CHECK=nsgmls -s -C ${CATALOG} || exit 1
 check:
        $(CHECK)
 
-.PHONY: html
-html: html/book1.htm
-
-html/book1.htm: ${DOCFILES} 
+html: $(DOCFILES)
        $(CHECK)
        ( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../${CATALOG} -d ${DSSSL_HTML} ../${DOCFILE} > /dev/null; ln -s book1.html index.html; cd ..)
 

diff --git a/make-dist.sh b/make-dist.sh
index 6494c945273ab291a040566079be10d83e0b1de5..2161cde3ffd7e7c3ea45813b8bb72b1dcbf9cee9 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -33,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 \
@@ -51,14 +47,14 @@ 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 ${DEBPKG}_${VERSION}-*.changes