Code review comment for lp:~csurbhi/ubuntu/maverick/gparted/gparted.fix-598946

Revision history for this message
Colin Watson (cjwatson) wrote :

Thanks for working on this bug.

The gparted package uses the newish 3.0 (quilt) source package format,
according to debian/source/format, so you need to do a bit more than
applying the patch directly to the source tree. Follow the directions
in /usr/share/doc/quilt/README.source to set up .quiltrc; you might also
want to set QUILT_REFRESH_ARGS="--no-timestamps -p ab" or similar. Then
import your patch; the least error-prone way is probably to start from a
clean checkout of lp:ubuntu/gparted, run 'quilt new 02_btrfs.patch',
then 'quilt shell', make your changes, exit, and run 'quilt refresh'
(although there are other faster ways).

(Debian is converging on 3.0 (quilt), so it's a useful one to learn,
although many packages also use older patch systems so we still have to
be pretty flexible. There's a wrapper script in
lp:~mvo/+junk/edit-patch which may be useful.)

You'll need to 'bzr add' the new file under debian/patches/ at the end.
You should end up with a 'bzr diff' that shows both the raw changes and
a new file in debian/patches/ with those same changes (this may seem a
bit odd but it's a trade-off against other useful properties that I can
describe elsewhere if you're interested).

The patch changes configure.in, but not configure. I think you'll need
to run 'autoreconf' inside 'quilt shell' in order for this change to
take effect.

It seems a bit odd to have this support be configured by a configure
option, but I see that this was in one of the upstream patches so it's
not necessary to undo that. In any case, it looks like the current
state of your branch won't build it in by default. You should add
--enable-btrfs to the configure options in debian/rules (make this
change directly rather than as a quilt patch).

« Back to merge proposal