r1965: *** empty log message ***

diff --git a/cvsbp-prepare b/cvsbp-prepare
deleted file mode 100755 (executable)
index 8e70e0a..0000000
--- a/cvsbp-prepare
+++ /dev/null
@@ -1,20 +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
-  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-dist.sh make-doc.sh make-upstream.sh make-debian.sh
-rm -f `find . -type f -name .cvsignore`
-rm -f cvsbp-prepare

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
index 8e70e0a6f1587f9d248ebb4f1e905acdefaf3a50..a970c84f07b5b5b9a1502dbb3a1142b4d5ac3e20 100755 (executable)
--- a/cvsbp-prepare.sh
+++ b/cvsbp-prepare.sh
@@ -6,6 +6,7 @@ set -e  # abort on error
 # 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 ..
@@ -15,6 +16,6 @@ else
 fi
 
 # Clean checked out CVS directory
-rm -f upload.sh make-dist.sh make-doc.sh make-upstream.sh make-debian.sh
+rm -f upload.sh make-upstream.sh make-debian.sh
 rm -f `find . -type f -name .cvsignore`
-rm -f cvsbp-prepare
+rm -f cvsbp-prepare.sh

diff --git a/make-debian.sh b/make-debian.sh
index 0fa2ebb2204f802be46b34a066f050f4a6d45f7d..8a6ebb5afc26173c2c908fb342c94d5548bf3edc 100644 (file)
--- a/make-debian.sh
+++ b/make-debian.sh
@@ -8,7 +8,7 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 export CVSROOT=`cat CVS/Root`
 
 echo "Building Debian files"
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -mkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf -F ${DEBPKG}
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -mkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare.sh -i.pdf -F ${DEBPKG}
 
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null

diff --git a/make-dist.sh b/make-dist.sh
deleted file mode 100755 (executable)
index 17a2bda..0000000
--- a/make-dist.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash 
-#
-# Creates debian and upstream packages
-# Programmer: Kevin Rosenberg
-
-set -e # abort on error
-
-progname="`basename \"$0\"`"
-
-usage () {
-  cat >&2 <<EOF
-Usage: $progname [options]
-Options:
-  -t   Tag CVS tree with current version numbers
-  -d   Use dpkg-buildpackage rather than default cvs-buildpackage
-  -l   Run lintian after building
-  -h   Print this brief help
-EOF
-}
-
-# Command line
-while [ $# != 0 ]; do
-    value="`echo x\"$1\" | sed -e 's/^x-.//'`"
-    case "$1" in
-        -h)  usage; exit 0           ;;
-        -t)  opt_tag=1               ;;
-        -d)  opt_dpkg_buildpackage=1 ;;
-        -l)  opt_lintian=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`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-DISTDIR=${PKG}-${VERSION}
-DEBDIR=${DEBPKG}-${VERSION}
-
-if [ -z ${opt_dpkg_buildpackage} ]; then
-  export CVSROOT=`cat CVS/Root`
-fi
-
-if [ ! -z ${opt_tag} ]; then
-  DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
-  UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
-  echo "(Re-)tagging with Debian tag '${DEB_TAG}'"
-  cvs -q rtag -d ${DEB_TAG} ${PKG} > /dev/null
-  cvs -q tag -F ${DEB_TAG} > /dev/null
-
-  # Retag with upstream tag if release not 0 or 1
-  if [ "`echo ${DEBVERSION} | egrep '\-0$\-1$]'`" != "" ]; then
-    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
-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}"
-rm -f ${DISTDIR}/upload.sh ${DISTDIR}/make-dist.sh  ${DISTDIR}/cvsbp-prepare 
-rm -f `find ${DISTDIR} -type f -name .cvsignore`
-rm -rf `find ${DISTDIR} -type d -name CVS`
-rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*'  -or -name '#*#' -or -name '.#*'`
-rm -f `find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
-  -name \*.log -or -name \*.out -or -name \*.dvi`
-
-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}
-
-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}
-
-echo "Building Debian files"
-if [ -z ${opt_dpkg_buildpackage} ]; then
-  cd ${TOPDIR}
-  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf -sa ${DEBPKG}
-  cd ..
-else
-  cd ${DEBDIR}
-  dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a -sa
-  mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
-  cd ..
-fi
-rm -rf ${DEBDIR}
-
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
-fi
-
-cd ${TOPDIR}
-
-exit 0