Merge lp://qastaging/~csurbhi/ubuntu/maverick/gparted/gparted.fix-598946 into lp://qastaging/ubuntu/maverick/gparted
Proposed by
Surbhi Palande
| Status: | Merged |
|---|---|
| Merged at revision: | 24 |
| Proposed branch: | lp://qastaging/~csurbhi/ubuntu/maverick/gparted/gparted.fix-598946 |
| Merge into: | lp://qastaging/ubuntu/maverick/gparted |
| Diff against target: |
696 lines (+512/-27) 10 files modified
.pc/applied-patches (+1/-0) configure.in (+18/-0) debian/changelog (+7/-0) debian/patches/02-btrfs.patch (+410/-0) debian/patches/series (+1/-0) include/Makefile.am (+6/-1) include/Utils.h (+12/-5) src/GParted_Core.cc (+47/-20) src/Makefile.am (+6/-1) src/Utils.cc (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~csurbhi/ubuntu/maverick/gparted/gparted.fix-598946 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This patch fixes the bug 598946 on LP. It adds the following btrfs support to gparted:
1) btrfs.mkfs
2) btrfs.fsck
3) btrfs-show
using the external btrfs-tools.
The original patch was fetched from https:/
It was slightly modified so as to keep the original support of btrfs detection intact. The original patch adds all the support in #if BTRFS_SUPPORT. Kept the original btrfs detection code in gparted in the #else part so as to allow btrfs partition from being detected even when gparted is compiled without BTRFS_SUPPORT = 1.
On the other hand when gparted is compiled with BTRFS_SUPPORT, the extra functionality along with detection is added.
Do consider merging this for maverick.
Thanks!
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) wrote | # |
Revision history for this message
| Surbhi Palande (csurbhi) wrote | # |
Revision history for this message
| Surbhi Palande (csurbhi) wrote | # |
Revision history for this message
| Surbhi Palande (csurbhi) wrote | # |
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for working on this bug.
The gparted package uses the newish 3.0 (quilt) source package format,
according to debian/
applying the patch directly to the source tree. Follow the directions
in /usr/share/
want to set QUILT_REFRESH_
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).