r2206: *** empty log message ***

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
deleted file mode 100755 (executable)
index a970c84..0000000
--- a/cvsbp-prepare.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e  # abort on error
-
-# Make documentation to put in debian package 
-# This must match prebuilt upstream documentation
-
-if [ -f doc/Makefile ]; then
-  echo "Making upstream documentation for CVS checked-out package"
-  cd doc
-  make all
-  cd ..
-else
-  echo "Unable to build documentation for CVS checked out package"
-  exit 1
-fi
-
-# Clean checked out CVS directory
-rm -f upload.sh make-upstream.sh make-debian.sh
-rm -f `find . -type f -name .cvsignore`
-rm -f cvsbp-prepare.sh

diff --git a/debian/rules b/debian/rules
index 7e45f30f98cb6455bc4ef77c39a4db4336da8b3e..723f3a8045c5ada23ef70de71db833b78472484a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,10 @@ install: build
        $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(lispfiles)
        $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(lispfiles)/mcl
 
+       rm -rf doc/html
+       (cd doc; tar xzf html.tar.gz; cd ..)
        $(INSTALL) $(INSTALLFLAGS) doc/html/* $(docfiles)/html
+       rm -rf doc/html
        cp doc/uffi.pdf doc/cl-uffi.pdf
        rm -f doc/cl-uffi.pdf.gz
        gzip doc/cl-uffi.pdf

diff --git a/make-debian.sh b/make-debian.sh
deleted file mode 100644 (file)
index 9c05fcb..0000000
--- a/make-debian.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-DEBPKG=cl-uffi
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
-TOPDIR=`pwd`
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-
-export CVSROOT=`cat CVS/Root`
-
-echo "Building Debian files"
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare.sh -i.pdf -F -d ${DEBPKG} -uc -us
-
-rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
-
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
-fi
-
-exit 0

diff --git a/make-upstream.sh b/make-upstream.sh
deleted file mode 100755 (executable)
index adb660c..0000000
--- a/make-upstream.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash 
-#
-# Creates upstream packages
-# Programmer: Kevin Rosenberg
-
-set -e # abort on error
-
-usage () {
-    progname="`basename \"$0\"`"
-
-    cat >&2 <<EOF
-Usage: $progname [options]
-Creates upstream archives
-Options:
-  -c   Commit and tag CVS tree with current version numbers
-  -t   Tag CVS tree with current version numbers
-  -f   Force creation of upstream archive, even if exists'
-  -h   Print this brief help
-EOF
-}
-
-opt_force=0
-
-# Command line
-while [ $# != 0 ]; do
-    value="`echo x\"$1\" | sed -e 's/^x-.//'`"
-    case "$1" in
-        -h)  usage; exit 0           ;;
-        -c)  opt_commit=1; opt_tag=1 ;;
-        -t)  opt_tag=1               ;;
-       -f)  opt_force=1             ;;
-         *)  usage; exit 0           ;;
-    esac
-    shift
-done
-
-DEBPKG=cl-uffi
-PKG=uffi
-TOPDIR=`pwd`
-
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
-
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-DISTDIR=${PKG}-${VERSION}
-DEBDIR=${DEBPKG}-${VERSION}
-
-if [ ! -z ${opt_commit} ]; then
-    cvs commit -m 'Debian build'
-fi
-
-if [ ! -z ${opt_tag} ]; then
-    UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
-    echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
-    cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
-    cvs -q tag -F $UPSTREAM_TAG > /dev/null
-
-fi
-
-if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
-  echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
-  echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
-  read answer
-  case $answer in
-      [Yy]*) nop= ;;
-      *) echo "Not building"
-        exit 1
-         ;;
-  esac
-fi
-
-# Prepare for archive
-cd ..
-rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
-rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
-cp -a ${TOPDIR} ${DISTDIR}
-
-echo "Cleaning distribution directory ${DISTDIR}"
-cd ${DISTDIR}
-rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh 
-rm -f `find . -type f -name .cvsignore`
-rm -rf `find . -type d -name CVS -or -name .bin`
-rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
-rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
-  -name \*.log -or -name \*.out -or -name \*.dvi`
-cd ..
-
-echo "Creating upstream archives"
-rm -rf ${DISTDIR}/debian
-GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
-
-cp -a ${DISTDIR} ${DEBDIR}
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
-
-unix2dos `find ${DISTDIR} -type f -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`
-zip -rq ${DISTDIR}.zip ${DISTDIR}
-
-cp -a ${TOPDIR}/debian ${DEBDIR}
-rm -f ${DEBDIR}/debian/.cvsignore 
-rm -rf ${DEBDIR}/debian/CVS
-
-rm -rf ${DISTDIR} ${DEBDIR}
-
-echo "Moving upstream archives to ${PACKAGE_DIR}"
-mkdir -p /usr/local/src/Packages/${DEBPKG}
-rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
-mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
-
-cd ${TOPDIR}
-exit 0

diff --git a/upload.sh b/upload.sh
deleted file mode 100755 (executable)
index 44d5f30..0000000
--- a/upload.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-PKG=uffi
-DEBPKG=cl-uffi
-
-set -e # abort on error
-
-usage () {
-    progname="`basename \"$0\"`"
-    
-    cat >&2 <<EOF
-Usage: $progname [options]
-Creates upstream archives
-Options:
-  -u   Upload only upstream packages
-  -d   Upload only debian packages
-  -h   Print this brief help
-EOF
-}
-
-opt_debian=1
-opt_upstream=1
-
-# Command line
-while [ $# != 0 ]; do
-    value="`echo x\"$1\" | sed -e 's/^x-.//'`"
-    case "$1" in
-        -h)  usage; exit 0           ;;
-        -u)  opt_debian=0            ;;
-        -d)  opt_upstream=0          ;;
-         *)  usage; exit 0           ;;
-    esac
-    shift
-done
-
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
-
-pushd /usr/local/src/Packages/${DEBPKG} > /dev/null
-
-if [ "${opt_upstream}" == "1" ]; then
-  echo "Uploading upstream files to web site"
-  UPSTREAM_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}/.
-  scp ${PKG}-${VERSION}.tar.gz ${UPSTREAM_DIR}
-  scp ${PKG}-${VERSION}.zip ${UPSTREAM_DIR}
-  ssh ftp.med-info.com "(cd /opt/apache/htdocs/${PKG}.med-info.com; make)" &
-fi
-
-echo "Uploading to Debian site"
-DEBIAN_DIR=debian.med-info.com:/home/ftp/pub/UploadQueue/.
-
-if [ "${opt_upstream}" == "1" ]; then
-  echo "...Uploading original upstream archive"
-  scp ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBIAN_DIR}
-fi
-scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
-
-popd > /dev/null
-
-