[Pbuilder-maint] Bug#312121: pbuilder: The attached patch should handle all cases

[Jonas Smedegaard]

Package: pbuilder
Version: 0.135
Followup-For: Bug #312121

Hi again,

Sorry - my last patch was completely broken.

I believe that the current one (using perl instead of sed) should handle
all cases correctly.


regards,

 - Jonas


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.13-git10+squashfs+wrr+fbsplash
Locale: LANG=da_DK, LC_CTYPE=da_DK (charmap=ISO-8859-1)

Versions of packages pbuilder depends on:
ii  cdebootstrap                  0.3.9      Bootstrap a Debian system
ii  coreutils                     5.2.1-2.1  The GNU core utilities
ii  debianutils                   2.14.3     Miscellaneous utilities specific t
ii  gcc                           4:4.0.2-1  The GNU C compiler
pn  wget                          <none>     (no description available)

Versions of packages pbuilder recommends:
ii  devscripts                    2.9.7      Scripts to make the life of a Debi
ii  fakeroot                      1.5.4      Gives a fake root environment
ii  sudo                          1.6.8p9-3  Provide limited super user privile

-- no debconf information
-------------- next part --------------
--- pdebuild.orig	2005-10-08 10:25:12.000000000 +0200
+++ pdebuild	2005-10-11 19:08:50.000000000 +0200
@@ -42,7 +42,7 @@
     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)-P(\s|$)/$1$2/g' | /bin/bash
     ${PBUILDERROOTCMD} pbuilder build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}"  --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
 fi