r1924: *** empty log message ***

diff --git a/make-dist.sh b/make-dist.sh
index c0fc0d34bfecdc9cd4bb6e0472d0ee80030509ba..334ed930bbe7db0e5bc97330978594f4deed910b 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -11,6 +11,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,9 +21,11 @@ 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
@@ -84,14 +88,15 @@ 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
+else
+  cvsbp
 fi
 
-cd ${TOPDIR}
+cd ..
 rm -rf ${DEBDIR}
 
 echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
@@ -100,5 +105,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