From 62cf4e318bdd03f3c4c7fd934cf5bee762ed634d Mon Sep 17 00:00:00 2001 From: dancer Date: Thu, 20 Oct 2005 14:30:40 +0000 Subject: #312121 fix and release 0.136 --- ChangeLog | 5 +++++ debian/changelog | 6 ++++-- pdebuild | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ace70e..8d40ba8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-20 Junichi Uekawa + + * pdebuild: apply patch from Jonas Smedegaard (#312121) + and change -P to -[bB] + 2005-10-19 Junichi Uekawa * testsuite/run-test.sh (testbuild): Change to use resolve-deps in testsuite for diff --git a/debian/changelog b/debian/changelog index 5b5c4aa..b2d57eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -pbuilder (0.136) UNRELEASED; urgency=low +pbuilder (0.136) unstable; urgency=low [Junichi Uekawa] * pbuilder-doc.xml: Update documentation on development policy + * Bug fix: "pdebuild: remove -B from DEBBUILDOPTS when building the + source package", thanks to Jonas Smedegaard (Closes: #312121). - -- Junichi Uekawa Sun, 9 Oct 2005 14:57:07 +0900 + -- Junichi Uekawa Thu, 20 Oct 2005 23:12:20 +0900 pbuilder (0.135) unstable; urgency=low diff --git a/pdebuild b/pdebuild index 7b91280..69e3757 100644 --- a/pdebuild +++ b/pdebuild @@ -42,7 +42,7 @@ else if ! dpkg-checkbuilddeps -B ; then echo "W: Unmet build-dependency in source" fi - echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | /bin/bash + echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[bB](\s|$)/$1$2/g' | /bin/bash ${PBUILDERROOTCMD} pbuilder build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi -- cgit v1.2.3