New boinc ready in unstable

[Gianfranco Costamagna]

Hi again ;)



Il Venerdì 4 Luglio 2014 19:46, Guo Yixuan <culu.gyx at gmail.com> ha scritto:


>
>
>Thank you!
>
>
>On Sun, Jun 29, 2014 at 3:03 AM, Gianfranco Costamagna <costamagnagianfranco at yahoo.it> wrote:
>>
>> The problem is the "crlf"
>> here
>> http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commitdiff;h=94ef16cf878f5187211c6d3507a547181bb24454
>> and
>> here
>> http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commitdiff;h=f78c1a40590bc1dd3f5e94d27f4aa0bf72190cce
>>
>> Unfortunately Rom put them in .gitattributes file, so I think we cannot commit that change.
>>
>>
>> What I did was  (in the boinc source tree)
>> mv debian ..
>> rm * -rf
>> cd ..
>> tar xzvf boinc_7.4.8...
>> mv boinc-7.4.8/* boinc
>> mv debian boinc
>>
>> and I think all ran well.
>> Git for some reason doesn't handle that crlf changes (maybe for the gitattribute setting, don't know), or maybe you just need to "git reset --hard" to a previous commit and pull again
>
>I'm just wondering about this:
>
>$ grep xpm boinc/.gitattributes                        
>*.xpm                   text eol=lf
>$ file boinc-7.4.8+dfsg/clientgui/res/atiicon.xpm 
>boinc-7.4.8+dfsg/clientgui/res/atiicon.xpm: X pixmap image, ASCII text, with CRLF line terminators
>
>
>So when we created boinc_7.4.8+dfsg.orig.tar.gz by git-archive,
>some EOLs were not normalized by git. It would be better to
>force git-archive to do this normalization, instead of resorting
>to some manual work-arounds. (Or, is it a bug in git?)
>

Don't know, anyway would be better to report this upstream... can you please do that?

thanks,

Gianfranco

>
>Regards,
>
>
>Yixuan
>
>