From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 16 Jul 2002 03:04:29 +0000 (+0000)
Subject: r2211: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~190
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=aecee14abac427c3fe2625516da49eaa2bf40503

r2211: *** empty log message ***
---

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
deleted file mode 100755
index 1769405..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 make-doc.sh ]; then
-  echo "Making upstream documentation for CVS checked-out package"
-  ./make-doc.sh
-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 make-doc.sh do-autoconf cvsbp-prepare.sh
-rm -f `find . -type f -name .cvsignore`
-rm -rf images doc stamp-h.in build-stamp configure-stamp
-rm -f cvsbp-prepare.sh
-
diff --git a/debian/cvsbp-prepare.sh b/debian/cvsbp-prepare.sh
new file mode 100755
index 0000000..0f81021
--- /dev/null
+++ b/debian/cvsbp-prepare.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e  # abort on error
+
+# Make documentation to put in debian package 
+# This must match prebuilt upstream documentation
+
+if [ -f make-doc.sh ]; then
+  echo "Making upstream documentation for CVS checked-out package"
+  ./make-doc.sh
+else
+  echo "Unable to build documentation for CVS checked out package"
+  exit 1
+fi
+
+# Clean checked out CVS directory
+rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh debian/cvsbp-prepare.sh
+rm -f make-doc.sh do-autoconf
+rm -f `find . -type f -name .cvsignore`
+rm -rf images doc stamp-h.in build-stamp configure-stamp
+rm -f cvsbp-prepare.sh
+
diff --git a/debian/make-debian.sh b/debian/make-debian.sh
new file mode 100755
index 0000000..d9c6d90
--- /dev/null
+++ b/debian/make-debian.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+DEBPKG=ctsim
+
+WORK_HOME=/usr/local/src/Work
+PKG_DIR=/usr/local/src/Packages/${DEBPKG}
+WORK_DIR=${WORK_HOME}/${PKG}
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
+
+CHANGELOG=${WORK_DIR}/debian/changelog
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG} |head -1`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG} |head -1`
+
+export CVSROOT=`cat CVS/Root`
+
+
+echo "Building Debian files"
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -i"\.pdf|\.htb" -F $* -d ${DEBPKG} -uc -us -sa
+
+if [ ! -z ${opt_lintian} ]; then
+  pushd ${PACKAGE_DIR} > /dev/null
+  lintian ${DEBPKG}_${DEBVERSION}_*.changes
+  popd > /dev/null
+fi
+
+exit 0
diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh
new file mode 100755
index 0000000..ca36845
--- /dev/null
+++ b/debian/make-upstream.sh
@@ -0,0 +1,93 @@
+#!/bin/bash 
+#
+# Creates upstream packages
+# Programmer: Kevin Rosenberg
+
+set -e # abort on error
+
+DEBPKG=ctsim
+PKG=ctsim
+
+WORK_HOME=/usr/local/src/Work
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
+WORK_DIR=${WORK_HOME}/${PKG}
+CHANGELOG=${WORK_DIR}/debian/changelog
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG} |head -1`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG} |head -1`
+
+DISTDIR=${PKG}-${VERSION}
+DEBDIR=${DEBPKG}-${VERSION}
+
+cvs commit -m "Autocommitting for ${VERSION}"
+
+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
+
+
+if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
+  echo "Making documentation"
+  ${WORK_DIR}/make-doc.sh
+fi
+
+# Prepare for archive
+rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
+rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
+cp -a ${WORK_DIR} ${DISTDIR}
+
+echo "Cleaning distribution directory ${DISTDIR}"
+cd ${DISTDIR}
+make distclean
+rm -f make-doc.sh 
+rm -f `find . -type f -name .cvsignore`
+rm -rf `find . -type d -name CVS -or -name .deps`
+rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~" -or -name "*.o" -or -name "*.a"`
+rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
+  -name \*.log -or -name \*.out -or -name \*.dvi`
+rm -rf images doc stamp-h.in build-stamp stamp-h configure-stamp autom4te.cache do-autoconf config.log config.status config.h
+cd ..
+
+echo "Creating upstream archives"
+rm -rf ${DISTDIR}/debian
+GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
+
+if [ "${DISTDIR}" != "${DEBDIR}" ]; then 
+  cp -a ${DISTDIR} ${DEBDIR}
+else
+  cp -a ${DISTDIR} ${DEBDIR}-copy
+fi
+
+unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
+  -name '*.cpp' -or -name '*.sh' -or -name '*.in' -or \
+  -name 'Makefile*' -or -name ChangeLog -or -name COPYRIGHT -or -name TODO -or \
+  -name README -or -name INSTALL -or -name NEWS -or -name '*.tex' -or \
+  -name '*.hhc' -or -name '*.hhk' -or -name '*.hpj' -or -name '*.ini' -or \
+  -name COPYING* -or -name catalog` 
+zip -rq ${DISTDIR}.zip ${DISTDIR}
+rm -r ${DISTDIR}
+
+if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
+  mv ${DEBDIR}-copy ${DEBDIR}
+fi
+GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
+
+cp -a ${WORK_DIR}/debian ${DEBDIR}
+rm -f ${DEBDIR}/debian/.cvsignore 
+rm -rf ${DEBDIR}/debian/CVS
+
+rm -rf ${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}
+
+exit 0
diff --git a/debian/upload.sh b/debian/upload.sh
new file mode 100755
index 0000000..fbb18de
--- /dev/null
+++ b/debian/upload.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+PKG=ctsim
+DEBPKG=ctsim
+
+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
+
+WORK_HOME=/usr/local/src/Work
+PKG_DIR=/usr/local/src/Packages/${DEBPKG}
+WORK_DIR=${WORK_HOME}/${PKG}
+CHANGELOG=${WORK_DIR}/debian/changelog
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG} |head -1`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG} |head -1`
+
+pushd ${PKG_DIR} > /dev/null
+
+FTP_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}
+if [ "${opt_upstream}" == "1" ]; then
+  echo "Uploading upstream files to web site"
+  scp ${PKG}-${VERSION}.tar.gz ${FTP_DIR}/.
+  scp ${PKG}-${VERSION}.zip ${FTP_DIR}/.
+  ssh ftp.med-info.com "(cd /opt/apache/htdocs/${PKG}.org; make)" &
+fi
+
+echo "Uploading to Debian site"
+DEBIAN_DIR=ftp.med-info.com:/home/ftp/pub/debian/UploadQueue
+
+if [ "${opt_upstream}" == "1" ]; then
+  echo "...Uploading original upstream archive"
+  scp ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBIAN_DIR}
+fi
+scp ${DEBPKG}*_${DEBVERSION}_*.deb ${FTP_DIR}/linux-debian/.
+scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
+scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
+scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
+scp ${DEBPKG}-{doc,help}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
+scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
+
+popd > /dev/null
+
+
diff --git a/make-debian.sh b/make-debian.sh
deleted file mode 100755
index 7e3441d..0000000
--- a/make-debian.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-DEBPKG=ctsim
-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|\.htb" -F $* -d ${DEBPKG} -uc -us -sa
-
-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
index d39aa59..0000000
--- a/make-upstream.sh
+++ /dev/null
@@ -1,127 +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:
-  -t   Tag CVS tree with current version numbers
-  -c   Commit all files to CVS server
-  -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               ;;
-        -c)  opt_commit=1            ;;
-         *)  usage; exit 0           ;;
-    esac
-    shift
-done
-
-DEBPKG=ctsim
-PKG=ctsim
-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
-    echo "Committing to CVS server"
-    cvs commit -m "Committing for ${VERSION}"
-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
-
-
-if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
-  echo "Making documentation"
-  ../make-doc.sh
-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}
-make distclean
-rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh make-doc.sh 
-rm -f `find . -type f -name .cvsignore`
-rm -rf `find . -type d -name CVS -or -name .deps`
-rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~" -or -name "*.o" -or -name "*.a"`
-rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
-  -name \*.log -or -name \*.out -or -name \*.dvi`
-rm -rf images doc stamp-h.in build-stamp stamp-h configure-stamp autom4te.cache do-autoconf config.log config.status config.h
-cd ..
-
-echo "Creating upstream archives"
-rm -rf ${DISTDIR}/debian
-GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
-
-if [ "${DISTDIR}" != "${DEBDIR}" ]; then 
-  cp -a ${DISTDIR} ${DEBDIR}
-else
-  cp -a ${DISTDIR} ${DEBDIR}-copy
-fi
-
-unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
-  -name '*.cpp' -or -name '*.sh' -or -name '*.in' -or \
-  -name 'Makefile*' -or -name ChangeLog -or -name COPYRIGHT -or -name TODO -or \
-  -name README -or -name INSTALL -or -name NEWS -or -name '*.tex' -or \
-  -name '*.hhc' -or -name '*.hhk' -or -name '*.hpj' -or -name '*.ini' -or \
-  -name COPYING* -or -name catalog` 
-zip -rq ${DISTDIR}.zip ${DISTDIR}
-rm -r ${DISTDIR}
-
-if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
-  mv ${DEBDIR}-copy ${DEBDIR}
-fi
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
-
-cp -a ${TOPDIR}/debian ${DEBDIR}
-rm -f ${DEBDIR}/debian/.cvsignore 
-rm -rf ${DEBDIR}/debian/CVS
-
-rm -rf ${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
index 4b5cec4..0000000
--- a/upload.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-PKG=ctsim
-DEBPKG=ctsim
-
-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
-
-FTP_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}
-if [ "${opt_upstream}" == "1" ]; then
-  echo "Uploading upstream files to web site"
-  scp ${PKG}-${VERSION}.tar.gz ${FTP_DIR}/.
-  scp ${PKG}-${VERSION}.zip ${FTP_DIR}/.
-  ssh ftp.med-info.com "(cd /opt/apache/htdocs/${PKG}.org; make)" &
-fi
-
-echo "Uploading to Debian site"
-DEBIAN_DIR=ftp.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}_*.deb ${FTP_DIR}/linux-debian/.
-scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
-scp ${DEBPKG}-doc_${DEBVERSION}_*.deb ${DEBIAN_DIR}
-scp ${DEBPKG}-help_${DEBVERSION}_*.deb ${DEBIAN_DIR}
-scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
-
-popd > /dev/null
-
-