[Pkg-openldap-devel] Bug#485263: openldap2.3: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches

[Russ Allbery]

Raphael Hertzog <hertzog at debian.org> writes:

> In the case of openldap2.3, it already uses quilt but some of the
> patches require the '-p0' option of patch to be properly applied and
> this option has been hardcoded in the series file. The new source
> package format doesn't support this quilt feature and requires patches
> to be applicable with the '-p1' option.
>
> You can use the following command to easily update all the patches
> that use the '-p0' option:
> awk '{ if ($2 == "-p0") print $1 }' debian/patches/series | while read f; do perl -pi -e 's|^--- (?:\./)?|--- a/|; s|^\+\+\+ (?:\./)?|+++ b/|;' debian/patches/$f ; done

Just FYI, a simple quilt refresh -p1 will convert a patch as well.  I
used:

for p in `grep -h -- -p0 debian/patches/series | awk '{print $1}'`; do
    quilt push $p
    quilt refresh -p1
done
quilt pop -a

-- 
Russ Allbery (rra at debian.org)               <http://www.eyrie.org/~eagle/>