r1923: *** empty log message ***

diff --git a/make-dist.sh b/make-dist.sh
index 07531e01375ab79117bbf27825514bad1107f38c..c0fc0d34bfecdc9cd4bb6e0472d0ee80030509ba 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -2,7 +2,30 @@
 # Creates debian and upstream packages
 # Programmer: Kevin Rosenberg
 
-set -e
+set -e # abort on error
+
+progname="`basename \"$0\"`"
+
+usage () {
+  cat >&2 <<EOF
+Usage: $progname [options]
+Options:
+  -t   Tag CVS tree with versions
+  -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            ;;
+         *)  usage; exit 0        ;;
+    esac
+    shift
+done
+
 
 DEBPKG=cl-uffi
 PKG=uffi
@@ -14,19 +37,20 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-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
+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
@@ -60,23 +84,21 @@ rm -rf ${DEBDIR}/debian/CVS
 
 rm -rf ${DISTDIR}
 
-export CVS_BUILDPACKAGE=1
-if [ "${CVS_BUILDPACKAGE}" == "" ]; then
+export CVS_BUILDPACKAGE=
+if [ -z ${CVS_BUILDPACKAGE} ]; then
   cd ${DEBDIR}
   echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
-  echo "Checking Debian Files"
-  lintian ${DEBPKG}_${VERSION}-*.changes
-  cd ..
 fi
 
+cd ${TOPDIR}
+rm -rf ${DEBDIR}
+
 echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
 mkdir -p /usr/local/src/Packages/${DEBPKG}
 mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
-rm -rf ${DEBDIR}
 mv ${DISTDIR}.zip ${PACKAGE_DIR}
 mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
 
-cd ${TOPDIR}
 
 exit 0