X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=9e002cd30f60101cc7ee4cbaa3cab5a9c9949d39;hb=e4eaba5eab623b020ff3ee4b5dce2bc99b203d60;hp=334ed930bbe7db0e5bc97330978594f4deed910b;hpb=e9202180c11296fdc9e6774979f02d32c16e4f28;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 334ed93..9e002cd 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,4 +1,5 @@
 #!/bin/bash 
+#
 # Creates debian and upstream packages
 # Programmer: Kevin Rosenberg
 
@@ -30,10 +31,9 @@ while [ $# != 0 ]; do
     shift
 done
 
-
 DEBPKG=cl-uffi
 PKG=uffi
-TOPDIR=`basename $PWD`
+TOPDIR=`pwd`
 
 VERSION=`cat VERSION`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
@@ -41,6 +41,10 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_cvs_buildpackage} ]; then
+  export CVSROOT=`cat CVS/Root`
+fi
+
 if [ ! -z ${opt_tag} ]; then
   DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
   UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
@@ -92,11 +96,13 @@ if [ -z ${opt_cvs_buildpackage} ]; then
   cd ${DEBDIR}
   echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
+  cd ..
 else
-  cvsbp
+  cd ${TOPDIR}
+  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i\*.pdf ${DEBPKG}
+  cd ..
 fi
 
-cd ..
 rm -rf ${DEBDIR}
 
 echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
@@ -107,7 +113,7 @@ mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
 
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_{DEBVERSION}_*.changes
+  lintian ${DEBPKG}_${DEBVERSION}_*.changes
   popd > /dev/null
 fi