From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 16 Jul 2002 10:41:46 +0000 (+0000)
Subject: r2225: Autocommit for make-debian
X-Git-Tag: v1.6.1~353
X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=43a09c901590a99761fe6a416c7144063e2b75f4;p=uffi.git

r2225: Autocommit for make-debian
---

diff --git a/debian/cvsbp-prepare.sh b/debian/cvsbp-prepare.sh
new file mode 100755
index 0000000..ddf4c29
--- /dev/null
+++ b/debian/cvsbp-prepare.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e  # abort on error
+
+# Clean checked out CVS directory
+rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh
+rm -f `find . -type f -name .cvsignore`
+rm -f stamp-h.in build-stamp configure-stamp
+rm -f debian/cvsbp-prepare.sh
diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index 53bd24d..09c287a 100755
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -5,19 +5,33 @@ set -e
 PKG=uffi
 DEBPKG=cl-uffi
 
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
-WORK_DIR=/usr/local/src/Work/${PKG}
+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"
-export CVSROOT=`cat CVS/Root`
-pushd ${WORK_DIR} > /dev/null
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -F -d ${DEBPKG} -uc -us -sa -i.cvsignore $*
-popd > /dev/null
-
-echo "Checking package with lintian"
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${WORK_DIR}/debian/changelog  |head -1`
-pushd ${PACKAGE_DIR} > /dev/null
-lintian ${DEBPKG}_${DEBVERSION}_*.changes
-popd > /dev/null
-
-exit 0
+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)
diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh
index 91c1b25..4479309 100755
--- a/debian/make-upstream.sh
+++ b/debian/make-upstream.sh
@@ -20,9 +20,8 @@ if [ -z "${VERSION}" ]; then
   exit 1
 fi
 
-pushd ${WORK_DIR} > /dev/null
+cd ${WORK_DIR}
 cvs commit -m 'Auto commit for Debian build'
-popd > /dev/null
 
 if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
diff --git a/debian/rules b/debian/rules
index ab80851..0fc5ec7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,10 +69,8 @@ install: build
 	dh_install doc/html $(doc-dir)
 	rm -rf doc/html
 	cp doc/uffi.pdf doc/cl-uffi.pdf
-	rm -f doc/cl-uffi.pdf.gz
-	gzip doc/cl-uffi.pdf
+	gzip -9 doc/cl-uffi.pdf
 	dh_install doc/cl-uffi.pdf.gz $(doc-dir)
-	rm -f doc/cl-uffi.pdf.gz
 
 # Build architecture-independent files here.
 binary-indep: build install