X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=1013cab4511b497d39dabfcc4e4201d5c579f972;hb=1406d6828d2b364df31e7444653efe1a2d0952b2;hp=c0fc0d34bfecdc9cd4bb6e0472d0ee80030509ba;hpb=745cd8e5453680742c1ecdb983e75bd196b9e848;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index c0fc0d3..1013cab 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,4 +1,5 @@
 #!/bin/bash 
+#
 # Creates debian and upstream packages
 # Programmer: Kevin Rosenberg
 
@@ -11,6 +12,8 @@ usage () {
 Usage: $progname [options]
 Options:
   -t   Tag CVS tree with versions
+  -c   Use cvs-buildpackage
+  -l   Run lintian on package
   -h   Print this brief help
 EOF
 }
@@ -19,17 +22,18 @@ EOF
 while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
-        -h)  usage; exit 0        ;;
-        -t)  opt_tag=1            ;;
-         *)  usage; exit 0        ;;
+        -h)  usage; exit 0           ;;
+        -t)  opt_tag=1               ;;
+        -c)  opt_cvs_buildpackage=1  ;;
+        -l)  opt_lintian=1           ;;
+         *)  usage; exit 0           ;;
     esac
     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`
@@ -37,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 . _`
@@ -84,14 +92,17 @@ rm -rf ${DEBDIR}/debian/CVS
 
 rm -rf ${DISTDIR}
 
-export CVS_BUILDPACKAGE=
-if [ -z ${CVS_BUILDPACKAGE} ]; then
+if [ -z ${opt_cvs_buildpackage} ]; then
   cd ${DEBDIR}
   echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
+  cd ..
+else
+  cd ${TOPDIR}
+  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC ${DEBPKG}
+  cd ..
 fi
 
-cd ${TOPDIR}
 rm -rf ${DEBDIR}
 
 echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
@@ -100,5 +111,12 @@ mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
 mv ${DISTDIR}.zip ${PACKAGE_DIR}
 mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
 
+if [ ! -z ${opt_lintian} ]; then
+  pushd ${PACKAGE_DIR} > /dev/null
+  lintian ${DEBPKG}_${DEBVERSION}_*.changes
+  popd > /dev/null
+fi
+
+cd ${TOPDIR}
 
 exit 0