r2232: Auto commit for Debian build

diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh
index 2c469c8584c8dbae187bf81400e3916384d6d07a..d970cb103df7c2dbbdca1fbb286d3efec7ec6517 100755 (executable)
--- a/debian/make-upstream.sh
+++ b/debian/make-upstream.sh
@@ -1,9 +1,8 @@
-#!/bin/bash 
-#
-# Creates upstream packages
-# Programmer: Kevin Rosenberg
+#!/bin/bash -e
+
+bups.sh -Sctsim -d"-name doc -or -name images"
+exit 0
 
-set -e # abort on error
 
 DEBPKG=ctsim
 PKG=ctsim

diff --git a/debian/upload.sh b/debian/upload.sh
index fbb18de39a32426566557b81a269726d672c1eeb..7e84d921609fe8e13a394e366fbe6bf96ee219af 100755 (executable)
--- a/debian/upload.sh
+++ b/debian/upload.sh
@@ -1,69 +1,22 @@
-#!/bin/sh
+#!/bin/sh -e
+
+echo "Uploading to Debian site"
+debupload.sh ctsim ctsim "ctsim ctsim-doc ctsim-help"
 
 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_HOME=/usr/local/src/Work
 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
+cd ${PKG_DIR}
 
 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
-
-
+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)" &