# HG changeset patch # User Paul Crowley # Date 1315469912 -3600 # Node ID 0d15506351db80d2fad889f05cd389b650b0e898 # Parent b7e56688dd14e23d7f2ffa9cdd50ae9268562f1b Make dbuild_release call dbuild diff -r b7e56688dd14 -r 0d15506351db dev/debian-build/dbuild --- a/dev/debian-build/dbuild Thu Sep 08 09:14:46 2011 +0100 +++ b/dev/debian-build/dbuild Thu Sep 08 09:18:32 2011 +0100 @@ -27,7 +27,7 @@ cd ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} #dpkg-buildpackage -kFD56DDC0 -dpkg-buildpackage +dpkg-buildpackage $DPKG_BUILDPACKAGE_OPTIONS cd .. lintian -i --pedantic -IE ${PACKAGE}_${DEBIAN_VERSION}_*.changes #sudo pbuilder --build ${PACKAGE}_${DEBIAN_VERSION}.dsc diff -r b7e56688dd14 -r 0d15506351db dev/debian-build/dbuild_release --- a/dev/debian-build/dbuild_release Thu Sep 08 09:14:46 2011 +0100 +++ b/dev/debian-build/dbuild_release Thu Sep 08 09:18:32 2011 +0100 @@ -2,30 +2,10 @@ set -e +DPKG_BUILDPACKAGE_OPTIONS=-kFD56DDC0 + cd $(hg root) -PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: \(.*\)/\1/p') -DEBIAN_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p') -# Lazy, but hey -UPSTREAM_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p') -BUILDDIR=$(pwd)/build/debian - -echo PACKAGE $PACKAGE -echo DEBIAN_VERSION $DEBIAN_VERSION -echo UPSTREAM_VERSION $UPSTREAM_VERSION -echo UPSTREAM $UPSTREAM -echo BUILDDIR $BUILDDIR +. dev/debian-build/dbuild -rm -rf ${BUILDDIR} -mkdir -p ${BUILDDIR} -hg archive -X '.hg*' -X 'dev/**' -t tgz -r release_${UPSTREAM_VERSION} \ - ${BUILDDIR}/${PACKAGE}_${UPSTREAM_VERSION}.orig.tar.gz -hg archive -X '.hg*' -X 'dev/**' -r debian_${DEBIAN_VERSION} \ - ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} - -cd ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} -dpkg-buildpackage -kFD56DDC0 -#dpkg-buildpackage -cd .. -lintian -i --pedantic -IE ${PACKAGE}_${DEBIAN_VERSION}_*.changes sudo pbuilder --build ${PACKAGE}_${DEBIAN_VERSION}.dsc