X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Fmake-debian.sh;h=a3d6a729cb92f5768bc4b05a644d5554ddfcbd7d;hb=00ad65c52abdb2ab482b2459d4171577d846a8e4;hp=d9c6d90da07f81a793a8def73af7d531ce53ad4b;hpb=13820f650ae253738e19484295a713527844827a;p=ctsim.git

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index d9c6d90..a3d6a72 100755
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -1,26 +1,37 @@
 #!/bin/bash
 
+PKG=ctsim
 DEBPKG=ctsim
 
-WORK_HOME=/usr/local/src/Work
-PKG_DIR=/usr/local/src/Packages/${DEBPKG}
+set -e
+
+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`
+
+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 > ${BUILD_LOG} 2>&1
 
-exit 0
+test -s ${PACKAGE_DIR}/${DEBPKG}_${DEBVERSION}_*.changes && \
+    (cd ${PACKAGE_DIR}; \ 
+    lintian ${DEBPKG}_${DEBVERSION}_*.changes)