r2228: *** empty log message ***

diff --git a/debian/control b/debian/control
index dfb32b9141d7f544bac84e6d9433011e86592ccb..8f97bcb123693c2465915929b85418061c9c9301 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cl-sql
 Section: devel
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kevin@rosenberg.net>
-Uploaders: Adam Di Carlo <aph@debian.org>
+Uploaders: Adam Di Carlo <aph@debian.org>, Barak A. Pearlmutter <bap@debian.org>
 Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.5.6
 

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 8e7a9403b35b15fd96489990990583aee43eb084..71dcfd6928ac6b14849b44a10b40a67be28014a4 100755 (executable)
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -1,37 +1,5 @@
-#!/bin/bash
+#!/bin/bash -e
 
-set -e
+bdeb.sh -Sclsql -Dcl-sql -Hdebian/cvsbp-prepare.sh
 
-PKG=clsql
-DEBPKG=cl-sql
-
-BASE_HOME=/usr/local/src
-WORK_HOME=${BASE_HOME}/Work
-WORK_DIR=${WORK_HOME}/${PKG}
-PACKAGE_DIR=${BASE_HOME}/Packages/${DEBPKG}
-SOURCE_DIR=${WORK_HOME}/${PKG}
-
-CHANGELOG=changelog
-CHANGELOG=${WORK_DIR}/debian/changelog
-UPSTREAM_VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG}  |head -1`
-DEB_VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG}  |head -1`
-
-DEB_DIR=${WORK_HOME}/${PKG}-${UPSTREAM_VERSION}
-ORIGINAL_TARBALL=${DEBPKG}_${UPSTREAM_VERSION}.orig.tar.gz
-BUILD_LOG=${WORK_HOME}/${DEBPKG}_${DEB_VERSION}_build.log
-
-if [ -z "${DEB_VERSION}" -o -z "${UPSTREAM_VERSION}" ]; then
-  echo "Error: unable to parse version in changelog file"
-  exit 1
-fi
-
-echo "Building Debian files"
-test -s CVS/Root && export CVSROOT=`cat CVS/Root`
-cd ${WORK_DIR}
-cvs com -m 'Autocommit for make-debian'
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -sa -i -H${WORK_DIR}/debian/cvsbp-prepare.sh $* > ${BUILD_LOG} 2>&1
-
-echo "Checking package"
-test -s ${PACKAGE_DIR}/${DEBPKG}_${DEBVERSION}_*.changes && \
-    (cd ${PACKAGE_DIR}; \ 
-    lintian ${DEBPKG}_${DEBVERSION}_*.changes)
+exit 0

diff --git a/debian/rules b/debian/rules
index 8b56685fe92d86f9742ea7032db6d21b37d71a56..f667c90d624cd6c5059c22e28454987bd73459cc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -131,6 +131,7 @@ install: build
                l=`echo $$p | sed -e "s/^cl-/cl/;"` ;\
                sed -e "s/%%/$$l/;" debian/prerm.template > debian/$$p.prerm ;\
                sed -e "s/%%/$$l/;" debian/postinst.template > debian/$$p.postinst ;\
+               chmod +x debian/$$p.prerm debian/$$p.prerm; \
        done
 
 

diff --git a/debian/upload.sh b/debian/upload.sh
index 326ea34a382c2aec7bed79b3e5f4735d5578998f..eb3369cf0d6c1b3db769d9a0ec9a3b5baee6ba78 100755 (executable)
--- a/debian/upload.sh
+++ b/debian/upload.sh
@@ -1,70 +1,6 @@
-#!/bin/sh
-
-set -e # abort on error
-
-PKG=clsql
-DEBPKG=cl-sql
-
-
-WORK_DIR=/usr/local/src/Work/${PKG}
-PKG_DIR=/usr/local/src/Packages/${DEBPKG}
-
-UPSTREAM_DIR=ftp.med-info.com:/home/ftp/pub/${PKG}/.
-FTP_DEBDIR=ftp.med-info.com:/home/ftp/pub/debian/UploadQueue
-
-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
-
-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
-
-if [ "${opt_upstream}" == "1" ]; then
-  echo "Uploading upstream files to web site"
-  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"
-
-if [ "${opt_upstream}" == "1" ]; then
-  echo "...Uploading original upstream archive"
-  scp ${DEBPKG}_${VERSION}.orig.tar.gz ${FTP_DEBDIR}
-fi
-scp ${DEBPKG}_${DEBVERSION}.diff.gz ${FTP_DEBDIR}
-scp ${DEBPKG}_${DEBVERSION}.dsc ${FTP_DEBDIR}
-scp ${DEBPKG}_${DEBVERSION}_*.deb ${FTP_DEBDIR}
-scp ${DEBPKG}-*_${DEBVERSION}_*.deb ${FTP_DEBDIR}
-scp ${DEBPKG}_${DEBVERSION}_*.changes ${FTP_DEBDIR} # upload last
-
-popd > /dev/null
+#!/bin/sh -e
 
+debupload.sh -Sclsql -Dcl-sql -hftp.med-info.com -d/home/ftp/pub/clsql \
+    -B"cl-sql cl-sql-base cl-sql-aodbc cl-sql-mysql cl-sql-postgresql cl-sql-postgresql-socket" \
+    -c"(cd /opt/apache/htdocs/clsql.med-info.com; make)"