aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2005-10-20 14:30:40 +0000
committerdancer <dancer>2005-10-20 14:30:40 +0000
commit62cf4e318bdd03f3c4c7fd934cf5bee762ed634d (patch)
treee262e0db821a2109ff21cd0f507c54bcdbdb95c8
parentc6ba95fedf920633514e00d2cc6aa13d755c60bb (diff)
downloadpbuilder-62cf4e318bdd03f3c4c7fd934cf5bee762ed634d.tar
pbuilder-62cf4e318bdd03f3c4c7fd934cf5bee762ed634d.tar.gz
#312121 fix and release 0.136
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog6
-rw-r--r--pdebuild2
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 <dancer@debian.org>
+
+ * pdebuild: apply patch from Jonas Smedegaard (#312121)
+ and change -P to -[bB]
+
2005-10-19 Junichi Uekawa <dancer@debian.org>
* 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 <dancer@debian.org> Sun, 9 Oct 2005 14:57:07 +0900
+ -- Junichi Uekawa <dancer@debian.org> 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