Comment 28 for bug 667802

Hi Didier,

> Hey Henrik, just to confirm from lp:~utouch-team/utouch-grail/packaging

> branch, I get this:

This is the packaging branch we use for natty.

> dpkg-source: info: construction de utouch-grail à partir de ./utouch-grail_1.0.16.orig.tar.gz
> patching file src/grail-api.c
> Reversed (or previously applied) patch detected! Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file src/grail-api.c.rej
> dpkg-source: erreur: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/0001-Report-touch-down-on-one-finger-entry.patch/ < utouch-grail-1.0.16.orig.shaNdj/debian/patches/0001-Report-touch-down-on-one-finger-entry.patch a produit une erreur de sortie de type 1
> dpkg-buildpackage: erreur: dpkg-source -i -I -b utouch-grail-1.0.16 a produit une erreur de sortie de type 2
> debuild: fatal error at line 1337:
> dpkg-buildpackage -rfakeroot -D -us -uc -i -I failed
> bzr: ERROR: The build failed.
>
> -> So debian/patches/0001-Report-touch-down-on-one-finger-entry.patch
> doesn't apply, I think you included it to 1.0.16 from the source. Once
> removed, it builds fine on both natty and maverick. Just a confirmation
> is needed before I sponsor to -proposed.

Yes, utouch-grail/packaging contains the change in source, whereas
utouch-grail/packaging.maverick contains the change as a patch. The patch and
special packaging.maverick branch was made to avoid modifying the main package
version in the SRU. In practice, both branches contain the same change. Please
pick the one you find most suitable, and we can adjust accordingly.

Thanks,
Henrik