X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Fmake-debian.sh;h=d25c49eb3a9ac4a794b70981f0174b369ee743cf;hb=d085ba5723806104593a775a144384a464d61002;hp=d9c6d90da07f81a793a8def73af7d531ce53ad4b;hpb=aecee14abac427c3fe2625516da49eaa2bf40503;p=ctsim.git

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index d9c6d90..d25c49e 100755
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -1,26 +1,40 @@
-#!/bin/bash
+#!/bin/bash -e
 
+bdeb.sh -Sctsim -c -Hdebian/cvsbp-prepare.sh
+exit 0
+
+PKG=ctsim
 DEBPKG=ctsim
 
-WORK_HOME=/usr/local/src/Work
-PKG_DIR=/usr/local/src/Packages/${DEBPKG}
+BASE_HOME=/usr/local/src
+WORK_HOME=${BASE_HOME}/Work
 WORK_DIR=${WORK_HOME}/${PKG}
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
+PACKAGE_DIR=${BASE_HOME}/Packages/${DEBPKG}
+SOURCE_DIR=${WORK_HOME}/${PKG}
 
+CHANGELOG=changelog
 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`
+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`
 
-export CVSROOT=`cat CVS/Root`
+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"
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -i"\.pdf|\.htb" -F $* -d ${DEBPKG} -uc -us -sa
+cd ${WORK_DIR}
 
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
-fi
+test -s CVS/Root && export CVSROOT=`cat CVS/Root`
 
-exit 0
+echo "Building Debian files"
+cvs com -m 'Autocommit for make-debian'
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -i -F $* -d ${DEBPKG} -uc -us -sa > ${BUILD_LOG} 2>&1
+
+echo "Checking package"
+test -s ${PACKAGE_DIR}/${DEBPKG}_${DEBVERSION}_*.changes && \
+    (cd ${PACKAGE_DIR}; \ 
+    lintian ${DEBPKG}_${DEBVERSION}_*.changes)