<html><body><div style="color:#000; background-color:#fff; font-family:HelveticaNeue-Light, Helvetica Neue Light, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif;font-size:10pt"><div style="" class=""><span style="" class="">The problem is the "crlf"</span></div><div class="" style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;"><span style="" class="">here</span></div><div class="" style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;"><span style="" class="">http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commitdiff;h=94ef16cf878f5187211c6d3507a547181bb24454</span></div><div class="" style="color: rgb(0, 0, 0); font-size:
13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;"><span style="" class="">and <br style="" class=""></span></div><div class="" style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;"><span style="" class="">here</span></div><div style="" class=""><span style="" class="">http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commitdiff;h=f78c1a40590bc1dd3f5e94d27f4aa0bf72190cce</span></div><div style="" class=""><br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">Unfortunately Rom put them in
.gitattributes file, so I think we cannot commit that change.</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class=""><br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class=""><br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">What I did was (in the boinc source tree)<br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica
Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">mv debian ..</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">rm * -rf</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">cd ..</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">tar xzvf boinc_7.4.8...</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue
Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">mv boinc-7.4.8/* boinc</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">mv debian boinc</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class=""><br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">and I think all ran well.</div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family:
HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">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<br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class=""><br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class=""><br></div><div style="color: rgb(0, 0, 0); font-size: 13.3333px; font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica
Neue,Helvetica,Arial,Lucida Grande,sans-serif; background-color: transparent; font-style: normal;" class="">cheers,<br style="" class=""></div><div style="" class="">
<br style="" class="">Gianfranco<br style="" class="">
<br style="" class=""></div> <div class="qtdSeparateBR"><br><br></div><div style="display: block;" class="yahoo_quoted"> <div class="" style="font-family: HelveticaNeue-Light, Helvetica Neue Light, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 10pt;"> <div class="" style="font-family: HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 12pt;"> <div style="" class="" dir="ltr"> <font style="" class="" face="Arial" size="2"> Il Domenica 29 Giugno 2014 5:55, Guo Yixuan <culu.gyx@gmail.com> ha scritto:<br style="" class=""> </font> </div> <blockquote class="" style="border-left: 2px solid rgb(16, 16, 255); margin-left: 5px; margin-top: 5px; padding-left: 5px;"> <br style="" class=""><br style="" class=""> <div style="" class=""><div style="" class="" id="yiv9242702871"><div style="" class=""><div style="" class="" dir="ltr">Hi,<div style="" class=""><br style="" class=""
clear="none"></div><div style="" class="">I just failed to build:</div><div style="" class=""><br style="" class="" clear="none"></div><div style="" class=""><div style="" class=""> dpkg-source -i -I -b boinc</div><div style="" class="">dpkg-source: info: using source format `3.0 (quilt)'</div><div style="" class="">dpkg-source: info: building boinc using existing ./boinc_7.4.8+dfsg.orig.tar.gz</div>
<div style="" class="">dpkg-source: warning: ignoring deletion of directory clientscr/progress/win</div><div style="" class="">dpkg-source: warning: ignoring deletion of directory clientscr/progress/win/x64</div><div style="" class="">dpkg-source: warning: ignoring deletion of directory clientscr/progress/win/x86</div>
<div style="" class="">dpkg-source: warning: file boinc/clientgui/res/templates/skins/Resource Information.txt has no final newline (either original or modified version)</div><div style="" class="">dpkg-source: info: local changes detected, the modified files are:</div>
<div style="" class=""> boinc/client/os2/boinc_attach.cmd</div><div style="" class=""> boinc/client/os2/setup.cmd</div><div style="" class=""> boinc/clientgui/res/atiicon.xpm</div><div style="" class=""> boinc/clientgui/res/blankicon.xpm</div><div style="" class=""> boinc/clientgui/res/externalweblink.xpm</div>
<div style="" class=""> boinc/clientgui/res/nvidiaicon.xpm</div><div style="" class=""> boinc/clientgui/res/skins/default/graphic/workunit_running_image.xpm</div><div style="" class=""> boinc/clientgui/res/skins/default/graphic/workunit_waiting_image.xpm</div><div style="" class=""> boinc/clientgui/res/templates/skins/Resource Information.txt</div>
<div style="" class=""> boinc/clientgui/skins/Charity Engine/skin.xml</div><div style="" class=""> boinc/clientgui/skins/Default/skin.xml</div><div style="" class=""> boinc/clientgui/skins/GridRepublic/skin.xml</div><div style="" class=""> boinc/clientgui/skins/ProgressThruProcessors/skin.xml</div>
<div style="" class=""> boinc/dcapi/java/example/boinc-java-launcher</div><div style="" class=""> boinc/dcapi/java/jre-boinc/jre_for_boinc_guide.txt</div><div style="" class=""> boinc/html/languages/translations/hu.po</div><div style="" class=""> boinc/html/languages/translations/nl.po</div><div style="" class="">
boinc/locale/ar/BOINC-Web.po</div><div style="" class=""> boinc/locale/be/BOINC-Manager.po</div><div style="" class=""> boinc/locale/be/BOINC-Web.po</div><div style="" class=""> boinc/locale/bg/BOINC-Web.po</div><div style="" class=""> boinc/locale/el/BOINC-Web.po</div><div style="" class=""> boinc/locale/fr/BOINC-Web.po</div>
<div style="" class=""> boinc/locale/gl/BOINC-Web.po</div><div style="" class=""> boinc/locale/hr/BOINC-Web.po</div><div style="" class=""> boinc/locale/hu/BOINC-Project-Generic.po</div><div style="" class="">dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/boinc_7.4.8+dfsg-1exp1.diff.RxYTwI</div>
<div style="" class="">dpkg-source: info: you can integrate the local changes with dpkg-source --commit</div><div style="" class="">dpkg-buildpackage: error: dpkg-source -i -I -b boinc gave error exit status 2</div></div><div style="" class=""><br style="" class="" clear="none"></div><div style="" class="">And the diff modifies these files:</div>
<div style="" class=""><div style="" class="">$ diffstat /tmp/boinc_7.4.8+dfsg-1exp1.diff.RxYTwI</div><div style="" class=""> boinc-7.4.8+dfsg/clientgui/skins/GridRepublic/skin.xml | 210 +--</div><div style="" class=""> boinc-7.4.8+dfsg/clientgui/skins/ProgressThruProcessors/skin.xml | 210 +--</div>
<div style="" class=""> boinc-7.4.8+dfsg/locale/bg/BOINC-Web.po | 30 </div><div style="" class=""> boinc-7.4.8+dfsg/locale/el/BOINC-Web.po | 24 </div><div style="" class=""> boinc-7.4.8+dfsg/locale/fr/BOINC-Web.po | 14 </div>
<div style="" class=""> boinc-7.4.8+dfsg/locale/gl/BOINC-Web.po | 14 </div><div style="" class=""> boinc-7.4.8+dfsg/locale/hr/BOINC-Web.po | 24 </div><div style="" class=""> client/os2/boinc_attach.cmd | 36 </div>
<div style="" class=""> client/os2/setup.cmd | 138 +-</div><div style="" class=""> clientgui/res/atiicon.xpm | 574 +++++-----</div><div style="" class=""> clientgui/res/blankicon.xpm | 78 -</div>
<div style="" class=""> clientgui/res/externalweblink.xpm | 92 -</div><div style="" class=""> clientgui/res/nvidiaicon.xpm | 282 ++--</div><div style="" class=""> clientgui/res/skins/default/graphic/workunit_running_image.xpm | 224 +--</div>
<div style="" class=""> clientgui/res/skins/default/graphic/workunit_waiting_image.xpm | 176 +--</div><div style="" class=""> clientgui/res/templates/skins/Resource | 14 </div><div style="" class=""> clientgui/skins/Charity | 210 +--</div>
<div style="" class=""> clientgui/skins/Default/skin.xml | 78 -</div><div style="" class=""> dcapi/java/example/boinc-java-launcher | 34 </div><div style="" class=""> dcapi/java/jre-boinc/jre_for_boinc_guide.txt | 82 -</div>
<div style="" class=""> html/languages/translations/hu.po | 2 </div><div style="" class=""> html/languages/translations/nl.po | 32 </div><div style="" class=""> locale/ar/BOINC-Web.po | 180 +--</div>
<div style="" class=""> locale/be/BOINC-Manager.po | 94 -</div><div style="" class=""> locale/be/BOINC-Web.po | 246 ++--</div><div style="" class=""> locale/hu/BOINC-Project-Generic.po | 2 </div>
<div style="" class=""> 26 files changed, 1550 insertions(+), 1550 deletions(-)</div></div><div style="" class=""><br style="" class="" clear="none"></div><div style="" class="">I have no idea why...</div><div style="" class=""><br style="" class="" clear="none"></div><div style="" class="">Yixuan</div></div><div style="" class=""><br style="" class="" clear="none"><br style="" class="" clear="none"><div style="" class="" id="yiv9242702871yqt99432"><div style="" class="">On Sat, Jun 28, 2014 at 12:48 PM, <a style="" class="" rel="nofollow" shape="rect" ymailto="mailto:costamagnagianfranco@yahoo.it" target="_blank" href="mailto:costamagnagianfranco@yahoo.it">costamagnagianfranco@yahoo.it</a> <span style="" class="" dir="ltr"><<a style="" class="" rel="nofollow" shape="rect" ymailto="mailto:costamagnagianfranco@yahoo.it" target="_blank" href="mailto:costamagnagianfranco@yahoo.it">costamagnagianfranco@yahoo.it</a>></span> wrote:<br style=""
class="" clear="none">
<blockquote class="" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><table style="" class="" border="0" cellpadding="0" cellspacing="0"><tbody style="" class=""><tr style="" class=""><td style="" class="" colspan="1" rowspan="1" valign="top"><div style="" class="" dir="ltr">Hi Steffen and Guo, my patch has been applied in less than a couple of hours, and Rom released the 7.4.8 hotfix after that.</div>
<div style="" class="" dir="ltr">I uploaded it because being unable to close the manager is a pretty annoying bug (btw only simple view is affected).</div>
<div style="" class="" dir="ltr">I also uploaded because of the fixes on init scripts that didn't reach unstable so far (only experimental).</div>
<div style="" class="" dir="ltr">Now boinc should be in a good shape, hopefully I also fixed the gpu not found old bug.</div>
<div style="" class="" dir="ltr">I'll upload a seti rebuild as soon as boinc is installed.</div>
<div style="" class="" dir="ltr">For milkyway I think we should remove it from testing, since upstream is not able to fix the computation error (they told is their fault, not a packaging problem).</div>
<div style="" class="" dir="ltr">I plan to take some rest and focus on other RC bugs :-)</div>
<div style="" class="" dir="ltr">BTW the .8 release has some changes in cr-lf in some po files, I had some problems (git probably ignores them because of the gitattributes file).</div>
<div style="" class="" dir="ltr">Probably you will have to download again the git repo (or reset to an older commit) and try again.</div>
<div style="" class="" dir="ltr">quilt push -a && fakeroot debian/rules clean build binary && quilt pop -a<br style="" class="" clear="none">
should work as usual, discarding that delta from the tarball</div>
<div style="" class="" dir="ltr">Cheers, and sorry for the "upload noise"</div>
<div style="" class="" dir="ltr">Gianfranco</div>
<div style="" class="" dir="ltr"><a style="" class="" rel="nofollow" shape="rect" target="_blank" href="https://uk.overview.mail.yahoo.com/mobile/?.src=Android">Sent from Yahoo Mail on Android</a></div>
</td></tr></tbody></table></blockquote></div></div><br style="" class="" clear="none"><br style="" class="" clear="all"><div style="" class=""><br style="" class="" clear="none"></div>-- <br style="" class="" clear="none"><div style="" class="" dir="ltr">GUO Yixuan</div>
</div></div></div><br style="" class=""><br style="" class=""></div> </blockquote> </div> </div> </div> </div></body></html>