r1819: further debian updates

diff --git a/Makefile b/Makefile
index faad77b25f70845230ad04e35e0df42c9c1b9889..eec3c379847361aca7abf529d48c8a8827c31d5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg, M.D.
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.43 2002/04/28 06:17:00 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.44 2002/04/28 08:19:55 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -14,7 +14,7 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
 PKG:=uffi
-SUBDIRS:= examples src
+SUBDIRS:= examples src benchmarks
 DOCSUBDIRS:=doc
 
 include Makefile.common
@@ -26,15 +26,18 @@ all:
 
 .PHONY: distclean
 distclean: clean
+       @$(MAKE) -C doc $@
 #      ./debian/rules clean
 
 
 VERSION=$(shell cat VERSION)
-DISTDIR=$(PKG)-$(VERSION)
-DIST_TARBALL=$(DISTDIR).tar.gz
-DIST_ZIP=$(DISTDIR).zip
-SOURCE_FILES=src doc examples Makefile uffi.system COPYRIGHT README TODO \
-        INSTALL uffi.lsm ChangeLog NEWS test-examples.cl set-logical.cl \
+PKGNAME=$(PKG)-$(VERSION)
+DISTDIR=$(PKGNAME)
+DIST_TARBALL=$(PKGNAME).tar.gz
+DIST_ORIG_TARBALL=$(PKGNAME).orig.tar.gz
+DIST_ZIP=$(PKGNAME).zip
+SOURCE_FILES=src doc examples Makefile uffi.system benchmarks COPYRIGHT README \
+        TODO INSTALL uffi.lsm ChangeLog NEWS test-examples.cl set-logical.cl 
 
 VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
 TAG=upstream_version_$(VERSION_UNDERSCORE)
@@ -51,23 +54,7 @@ doc:
 .PHONY: dist
 dist: distclean
        $(MAKE) -C doc $@
-       @rm -rf $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
-       @mkdir $(DISTDIR)
-       @cp -a $(SOURCE_FILES) $(DISTDIR)
-       @find $(DISTDIR) -type d -name CVS |xargs rm -rf
-       @rm -rf $(DISTDIR)/debian
-       @find $(DISTDIR) -type f -name .cvsignore -exec rm {} \;
-       @find $(DISTDIR)/doc -type f -name \*.tex -or -name \*.aux -or \
-                -name \*.log -or -name \*.out -or -name \*.dvi -or \
-                -name \*~ -or -name \*.ps -exec rm {} \;
-       @tar czf $(DIST_TARBALL) $(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 $(DIST_ZIP) $(DISTDIR)
-       @rm -r $(DISTDIR)
+       @make-dist.sh
 
 .PHONY: wwwdist
 wwwdist: dist

diff --git a/Makefile.common b/Makefile.common
index 0b06cc35058207731a0c8940ce8e5d3c2b3661f1..82c41a461403eafc9b4954dbaf2abb3fdedd41ef 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,6 +7,8 @@ clean:
        @rm -f *.ufsl *.fsl *.fas *.x86f *.sparcf *.fasl 
        @rm -f *~ *.bak *.orig *.err \#*\# .#*
        @rm -f *.so *.a
+       @rm -f uffi-[0-9]*[0-9].tar.gz uffi-[0-9]*[0-9].zip
+       @rm -rf debian/cl-uffi
 ifneq ($(SUBDIRS)$(DOCSUBDIRS),)
        @set -e; for i in $(SUBDIRS) $(DOCSUBDIRS); do \
                $(MAKE) -C $$i $@; done

diff --git a/debian/changelog b/debian/changelog
index 3631dd24c8ccd6f81911bd93a0712c174a6faa49..4a39f77b7c0505ee4fbe240ba619a7cfb3d48664 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cl-uffi (0.4.3-1) unstable; urgency=low
+cl-uffi (0.4.4-1) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/debian/cl-uffi.doc-base b/debian/cl-uffi.doc-base
new file mode 100644 (file)
index 0000000..3b46887
--- /dev/null
+++ b/debian/cl-uffi.doc-base
@@ -0,0 +1,15 @@
+Document: cl-uffi
+Title: Debian UFFI Manual
+Author: Kevin M. Rosenberg
+Abstract: This manual describes how
+ to use the UFFI Common Lisp library.
+Section: lisp
+
+Format: postscript
+Files: /usr/share/doc/cl-uffi/cl-uffi.ps.gz
+
+Format: HTML
+Index: /usr/share/doc/cl-uffi/html/index.html
+Files: /usr/share/doc/cl-uffi/html/*.html
+
+  

diff --git a/debian/doc-base b/debian/doc-base
deleted file mode 100644 (file)
index 399d880..0000000
--- a/debian/doc-base
+++ /dev/null
@@ -1,15 +0,0 @@
-Document: cl-uffi
-Title: Debian UFFI Manual
-Author: Kevin M. Rosenberg
-Abstract: This manual describes how
- to use the UFFI Common Lisp library.
-Section: devel
-
-Format: postscript
-Files: /usr/share/doc/cl-uffi/cl-uffi.ps.gz
-
-Format: HTML
-Index: /usr/share/doc/cl-uffi/html/index.html
-Files: /usr/share/doc/cl-uffi/html/*.html
-
-  

diff --git a/make-dist.sh b/make-dist.sh
new file mode 100755 (executable)
index 0000000..fdf21ea
--- /dev/null
+++ b/make-dist.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+
+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
+
+TAG=upstream_version_`echo $VERSION | tr . _`
+echo "(re)tagging with release tag '$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}
+)
+
+exit 0