-if [ -z ${opt_cvs_buildpackage} ]; then
- cd ${DEBDIR}
- echo "Building Debian files"
- dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
+echo "Moving upstream archives to ${PACKAGE_DIR}"
+rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
+mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
+echo "Building Debian files"
+if [ -z ${opt_dpkg_buildpackage} ]; then
+ cd ${TOPDIR}
+ cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf ${DEBPKG}