[Pbuilder-maint] Bug#448757: pbuilder: pdebuild - Breakage when using XC- headers

[Soren Hansen]

Package: pbuilder
Version: 0.174
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1



In Ubuntu, we've applied the attached patch to achieve the following:

  * Fix sed for pdebuild-internal to stop matching Original-Maintainer
    field as an output file name.

More generally, as any custom .changes fields in the control file
(XC-blah) lands at the bottom of the .changes file, the sed magic in
pdebuild-internal accidentally matches those fields as files to be
copied. We work around this by requiring a space at the beginning of the
line for us to consider it a file to be copied.

We thought you might be interested in doing the same. 

- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHKKCBonjfXui9pOMRAohFAJ9su4GHymMeXe6Zn3URKHOkAuV/OQCfQ2rq
mloXWTvSjx7ZrVYCIRztRXI=
=xUDj
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -Nru /tmp/7jiUmuJJVn/pbuilder-0.174ubuntu1/debian/changelog /tmp/Vrb48UhHTS/pbuilder-0.174ubuntu2/debian/changelog
diff -Nru /tmp/7jiUmuJJVn/pbuilder-0.174ubuntu1/pdebuild /tmp/Vrb48UhHTS/pbuilder-0.174ubuntu2/pdebuild
--- /tmp/7jiUmuJJVn/pbuilder-0.174ubuntu1/pdebuild	2007-05-27 06:02:57.000000000 +0200
+++ /tmp/Vrb48UhHTS/pbuilder-0.174ubuntu2/pdebuild	2007-10-31 16:13:03.000000000 +0100
@@ -47,7 +47,7 @@
 if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
     ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
     if [ -d "${BUILDRESULT}" ]; then
-	for files in $(sed -rn '/^Files:/,${s/.* ([^ ]+)$/\1/p}' ../${CHANGES}); do
+	for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' ../${CHANGES}); do
 	    cp -a ../"$files" "${BUILDRESULT}"
 	done
 	cp -a ../${CHANGES} "${BUILDRESULT}"