On Wed, 10 Aug 2016 at 16:41:40 -0400, Barry Warsaw wrote:
> * With git-dpm we *had* to enforce the tool choice because git-dpm's artifacts
> had to be preserved. If we ditch git-dpm, is that still the case? IOW, if
> you choose to use gbp-pq, am I forced to do so when I modify the same repo?
You do not have to choose gbp-pq. You do have to use some tool that
copes with:
* a git repository with patches unapplied but present in debian/patches/
* no other special metadata present in git (you can optionally commit a
debian/gbp.conf, and I would recommend it, but it isn't required)
In particular this rules out dgit (which wants a patches-applied tree)
and git-dpm (which wants a patches-applied tree with its own metadata).
In practice this means you can build with either gbp buildpackage, or plain
dpkg-buildpackage/debuild; and you can manage the patches either with gbp pq,
with quilt, or (in simple cases) by running git format-patch in an
upstream-tracking repository, dropping the results into debian/patches/
and modifying debian/patches/series with a text editor.
gbp pq works best if all repository users stick to the dialect of DEP-3
where all Debian-specific pseudo-headers appear at the end of the diff
(next to the Signed-off-by if any), so that it looks a lot like git
format-patch output (canonically with the leading From_ line and the
trailing signature omitted, although if they're present in input it
will of course cope). This is basically also what git-dpm generates,
so it should be familiar to DPMT people already. Good for gbp-pq:
From: Donald Duck <don...@example.com>
Date: Fri, 01 Apr 2016 12:34:00 +0100
Subject: Reticulate splines correctly
This regressed in 2.0.
In particular, this broke embiggening.
Origin: vendor, Debian
Forwarded: http://bugs.example.org/123
---
[diff goes here]
Not good for gbp-pq (it works OK, but an import/export round-trip will
mangle the metadata if you don't take steps to preserve it):
Author: Donald Duck <don...@example.com>
Description: Reticulate splines correctly
This regressed in 2.0.
.
In particular, this broke embiggening.
Last-update: Fri, 01 Apr 2016 12:34:00 +0100
Origin: vendor, Debian
Forwarded: http://bugs.example.org/123
---
[diff goes here]
Regards,
S
