[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Upstream tarballs with varying line endings



Paul Wise <pabs@debian.org> writes:

> On Wed, Nov 20, 2013 at 3:15 AM, Felix Natter wrote:
>
>> The patches don't apply with line ending changes.
>
> The best course of action appears to be to get your patches included
> upstream

This is not possible for all patches. For instance, Freeplane also has a
Mageia linux package and so due to the lack of a recent Mageia
libjgoodies-forms-java package, we cannot update upstream to the new
libjgoodies-forms-java...

> and also ask them to stop exporting tarballs with Windows
> line endings.

It's not possible. We have decided that we want to stick with this git
line ending policy and that means that checkouts on Windows will have
CRLF line endings (I am part of upstream but I wasn't involved in the
discussion).

So what solution would you prefer?

1. integrate http://ant.apache.org/manual/Tasks/fixcrlf.html upstream
(generate tarball, extract, fix line endings, generate tarball)

or 

2. write a get-orig-source target that does the same?
If yes, shall I append "+dfsg1" to the version number?

=> I guess both are possible are OK for Debian?

Thanks and Best Regards,
-- 
Felix Natter


Reply to: