r1968: *** empty log message ***

diff --git a/make-debian.sh b/make-debian.sh
index 938512ea90a18b2bb9de62e12d349819e37ebc06..778ce0aace2dfc9d0efb376b7191c4e3511b53a4 100644 (file)
--- a/make-debian.sh
+++ b/make-debian.sh
@@ -8,7 +8,9 @@ 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 ${DEBPKG}
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare.sh -i.pdf -F -d ${DEBPKG}
+
+rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}
 
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null

diff --git a/make-upstream.sh b/make-upstream.sh
index 71b6632e80b3864d691bf2fdc3149de4a98700f1..1a2a22e068299ce46cbf6a8c989f491f8c426636 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -5,10 +5,10 @@
 
 set -e # abort on error
 
-progname="`basename \"$0\"`"
-
 usage () {
-  cat >&2 <<EOF
+    progname="`basename \"$0\"`"
+
+    cat >&2 <<EOF
 Usage: $progname [options]
 Creates upstream archives
 Options:
@@ -53,7 +53,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
-rm -f upload.sh make-upload.sh make-debian.sh cvsbp-prepare.sh 
+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`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`

diff --git a/upload.sh b/upload.sh
index d6191951bd37f0961368b83da8a1c537825a9707..76175827fa8f9e4faf79a12c504d6b00e9e43631 100755 (executable)
--- a/upload.sh
+++ b/upload.sh
@@ -1,17 +1,62 @@
 #!/bin/sh
 
-pkg=uffi
-debpkg=cl-uffi
+PKG=uffi
+DEBPKG=cl-uffi
 
-pushd /usr/local/src/Packages/${debpkg} > /dev/null
+set -e # abort on error
 
-echo "Uploading files to web site"
-scp ${pkg}-*.tar.gz ${pkg}-*.zip ftp.med-info.com:/home/ftp/pub/${pkg}/.
-ssh ftp.med-info.com "(cd /opt/apache/htdocs/${pkg}.med-info.com; make)" &
+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"
-scp *z *dsc *deb ftp.med-info.com:/home/ftp/pub/UploadQueue
-scp *changes ftp.med-info.com:/home/ftp/pub/UploadQueue
+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}.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