Bug#845659: debpatch: New script, "Apply a debdiff to a Debian source package"

[Ximin Luo]

Ximin Luo:
> James McCoy:
>> On Thu, Jan 05, 2017 at 04:18:00PM +0000, Ximin Luo wrote:
>>> Ximin Luo:
>>>> As part of the Reproducible Builds effort, I've written a tool called
>>>> debpatch(1), see the branch here:
>>>> [..]
>>>
>>> Hi devscripts team,
>>>
>>> Any news on this?
>>
>> Apologies for not giving this a review sooner.
>>
>>> I would also be happy to merge this myself (I have
>>> the access) but I thought it would be good to ask for a review first,
>>> since I haven't contributed to this repo before.
>>
>> I agree with Sean that it would be good to not to have another
>> reimplementation of changelog merging.  However, if dpkg-mergechangelogs
>> doesn't provide the functionality you need, I would recommend looking at
>> python3-debian's debian.changelog module.  I think that would probably
>> be easier than trying to twist dch into doing the work.
>>
> 
> Sorry for the delay, I have now made these changes.
> 
> dpkg-mergechangelogs seemed interesting but actually does a different job - it merges different entries by total ordering on Debian version numbers, and it does a normal 3-way merge when changes to the same entry are detected. This type of merging seems more suited to packages that have already been released. For example, it was unable to merge my pu/debpatch branch with the current master, and I had to resolve that manually.
> 
> OTOH debpatch is for rebasing unreleased changes on top of new released packages. So what we want here is to plonk any added extra changelog entry, on top of the new base, and adjust the version number accordingly.
> 
> I have switched to using debian.changelog though, thanks for the tip. I also got rid of some dirty "this is already applied" logic and removed some arbitrary limits.
> 
> https://anonscm.debian.org/cgit/collab-maint/devscripts.git/log/?h=pu/debpatch
> 
> Pushed there ^ but also would be happy to squash these commits if you prefer.
> 

I've updated git (pu/debpatch branch) with a few more minor changes.

Is it OK if I merge this into master now?

X

-- 
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git