[Pkg-systemd-maintainers] Switching the git repository to git-buildpackage

[Michael Biebl]

Am 27.02.2014 13:00, schrieb Michael Stapelberg:
> Hi Michael,
> 
> Michael Biebl <biebl at debian.org> writes:
>> Am 27.02.2014 10:46, schrieb Michael Stapelberg:
>>
>>>>
>>>> So, again, I’m asking whether I can go ahead and propose a plan on how
>>>> to switch to git-buildpackage? I’d really like to see this happening.
>>> Friendly ping.
>>>
>>
>> What's the plan regarding patch management? Have you any ideas/proposals
>> for that?
> Personally, I’d just put them into debian/patches/ manually, but I can
> be convinced to use some more advanced solution, provided it plays nice
> with git-buildpackage and doesn’t move us far away from the standard
> workflow (i.e. gbp-clone and git-buildpackage just working without any
> setup).

I think I'd put the debian specific changes into patches in
debian/patches/ with each patch representing such a logical unit.

Upstream fixes I'd like to continue to cherry-pick, but directly to the
debian branch (no more upstream-fixes branch).
This would mean, those patches are simply integrated once we merge a new
upstream release → less work for us.
That the cherry-picks would end up as giant diff I wouldn't mind, tbh.

What's more important imho is, that the debian specific changes are
split into a proper patch series.

Michael, to get things moving (and probably the most work) is to create
such a patch series. Could you start creating a branch, say
debian-patches, where each change/patch is represented by a single commit?

Once we have that, we can easily export that.


As for git-buildpackage: it typically imports full upstream tarballs
whereas in gitpkg we simply merge the tag from the upstream master
branch. The benefit of gitpkg is of course that we have the full git
history.

Has anyone used git-buildpackage doing both, i.e. directly merge from
master + import full dist tarballs?



-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 884 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-systemd-maintainers/attachments/20140227/fce6c07b/attachment-0002.sig>