On Tue, Jul 17, 2018 at 09:27:45PM +0100, Christopher Baines wrote:
> The following patches attempt to remove the duplicates, favouring the
> original package definition.

I sent one comment, otherwise the patches LGTM.

> Is there any way of guarding against adding these, or more accurately
> checking for duplicate definitions?

I don't know. Hopefully someone else has some ideas.