El 26/05/14 21:12, Felipe Sateler ha escrit:
On Wed, May 21, 2014 at 5:26 PM, Martin Steghöfer <mar...@steghoefer.eu> wrote:
I tried it once, following the instructions on
https://wiki.debian.org/PackagingWithGit, but decided against using it. It
didn't simplify my work, but instead cluttered up my repository with the
upstream source files. I don't get the point of having upstream files in the
repository, if you're not allowed to touch them directly (only via patches).
But you can generate the patch using git:
% git checkout -b my-branch
% vim src/file1.c
% git commit -a -m "Very important patch"
% git checkout master
% git format-patch my-branch
% mv 0000-* debian/patches/my-patch.patch
% echo my-patch.patch > debian/patches/series
The patch-queue tool in git-buildpackage can be useful too (gbp-pq).
True that, before my post I hadn't seen gbp-pq yet (the Debian wiki page
[1] about git packaging is a bit tenuous). In fact, after I wrote that,
I gave gpb-pq a try (see latest commits on git [2] [3]) and kinda liked
it, so I adopted it.
I don't like the patch output format of gbp-pq though [3]. It forces me
to use the "From" + "Subject" + "unstructured text" style instead of
"Author" + "Description", it uglifies the "From" value with encoding
information (isn't the whole file UTF-8 by default?) and it's very
verbose (Do I really want statistics about the number of modifications
within my patch file?). I guess it's more standard (UNIX mailbox
format), but it surely makes things less readable. Maybe there are some
tuning possibilities that I haven't found yet, it probably uses
git-format-patch internally, which is somewhat customizable.
But for the patches the workflow is nice - it can't be much worse than
manual quilt management anyway. At least some reward for dragging the
upstream source around and having "git-buildpackage" complain about
dirty working directories all the time!
Cheers,
Martin
[1] https://wiki.debian.org/PackagingWithGit
[2]
https://github.com/martin-steghoefer/debian-karlyriceditor/commit/d48ccd50
[3]
https://github.com/martin-steghoefer/debian-karlyriceditor/commit/f02325de
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
