New boinc ready in unstable
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Sun Jun 29 07:03:26 UTC 2014
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
cheers,
Gianfranco
Il Domenica 29 Giugno 2014 5:55, Guo Yixuan <culu.gyx at gmail.com> ha scritto:
>
>
>Hi,
>
>
>I just failed to build:
>
>
> dpkg-source -i -I -b boinc
>dpkg-source: info: using source format `3.0 (quilt)'
>dpkg-source: info: building boinc using existing ./boinc_7.4.8+dfsg.orig.tar.gz
>dpkg-source: warning: ignoring deletion of directory clientscr/progress/win
>dpkg-source: warning: ignoring deletion of directory clientscr/progress/win/x64
>dpkg-source: warning: ignoring deletion of directory clientscr/progress/win/x86
>dpkg-source: warning: file boinc/clientgui/res/templates/skins/Resource Information.txt has no final newline (either original or modified version)
>dpkg-source: info: local changes detected, the modified files are:
> boinc/client/os2/boinc_attach.cmd
> boinc/client/os2/setup.cmd
> boinc/clientgui/res/atiicon.xpm
> boinc/clientgui/res/blankicon.xpm
> boinc/clientgui/res/externalweblink.xpm
> boinc/clientgui/res/nvidiaicon.xpm
> boinc/clientgui/res/skins/default/graphic/workunit_running_image.xpm
> boinc/clientgui/res/skins/default/graphic/workunit_waiting_image.xpm
> boinc/clientgui/res/templates/skins/Resource Information.txt
> boinc/clientgui/skins/Charity Engine/skin.xml
> boinc/clientgui/skins/Default/skin.xml
> boinc/clientgui/skins/GridRepublic/skin.xml
> boinc/clientgui/skins/ProgressThruProcessors/skin.xml
> boinc/dcapi/java/example/boinc-java-launcher
> boinc/dcapi/java/jre-boinc/jre_for_boinc_guide.txt
> boinc/html/languages/translations/hu.po
> boinc/html/languages/translations/nl.po
> boinc/locale/ar/BOINC-Web.po
> boinc/locale/be/BOINC-Manager.po
> boinc/locale/be/BOINC-Web.po
> boinc/locale/bg/BOINC-Web.po
> boinc/locale/el/BOINC-Web.po
> boinc/locale/fr/BOINC-Web.po
> boinc/locale/gl/BOINC-Web.po
> boinc/locale/hr/BOINC-Web.po
> boinc/locale/hu/BOINC-Project-Generic.po
>dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/boinc_7.4.8+dfsg-1exp1.diff.RxYTwI
>dpkg-source: info: you can integrate the local changes with dpkg-source --commit
>dpkg-buildpackage: error: dpkg-source -i -I -b boinc gave error exit status 2
>
>
>And the diff modifies these files:
>$ diffstat /tmp/boinc_7.4.8+dfsg-1exp1.diff.RxYTwI
> boinc-7.4.8+dfsg/clientgui/skins/GridRepublic/skin.xml | 210 +--
> boinc-7.4.8+dfsg/clientgui/skins/ProgressThruProcessors/skin.xml | 210 +--
> boinc-7.4.8+dfsg/locale/bg/BOINC-Web.po | 30
> boinc-7.4.8+dfsg/locale/el/BOINC-Web.po | 24
> boinc-7.4.8+dfsg/locale/fr/BOINC-Web.po | 14
> boinc-7.4.8+dfsg/locale/gl/BOINC-Web.po | 14
> boinc-7.4.8+dfsg/locale/hr/BOINC-Web.po | 24
> client/os2/boinc_attach.cmd | 36
> client/os2/setup.cmd | 138 +-
> clientgui/res/atiicon.xpm | 574 +++++-----
> clientgui/res/blankicon.xpm | 78 -
> clientgui/res/externalweblink.xpm | 92 -
> clientgui/res/nvidiaicon.xpm | 282 ++--
> clientgui/res/skins/default/graphic/workunit_running_image.xpm | 224 +--
> clientgui/res/skins/default/graphic/workunit_waiting_image.xpm | 176 +--
> clientgui/res/templates/skins/Resource | 14
> clientgui/skins/Charity | 210 +--
> clientgui/skins/Default/skin.xml | 78 -
> dcapi/java/example/boinc-java-launcher | 34
> dcapi/java/jre-boinc/jre_for_boinc_guide.txt | 82 -
> html/languages/translations/hu.po | 2
> html/languages/translations/nl.po | 32
> locale/ar/BOINC-Web.po | 180 +--
> locale/be/BOINC-Manager.po | 94 -
> locale/be/BOINC-Web.po | 246 ++--
> locale/hu/BOINC-Project-Generic.po | 2
> 26 files changed, 1550 insertions(+), 1550 deletions(-)
>
>
>I have no idea why...
>
>
>Yixuan
>
>
>
>On Sat, Jun 28, 2014 at 12:48 PM, costamagnagianfranco at yahoo.it <costamagnagianfranco at yahoo.it> wrote:
>
>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.
>>I uploaded it because being unable to close the manager is a pretty annoying bug (btw only simple view is affected).
>>I also uploaded because of the fixes on init scripts that didn't reach unstable so far (only experimental).
>>Now boinc should be in a good shape, hopefully I also fixed the gpu not found old bug.
>>I'll upload a seti rebuild as soon as boinc is installed.
>>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).
>>I plan to take some rest and focus on other RC bugs :-)
>>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).
>>Probably you will have to download again the git repo (or reset to an older commit) and try again.
>>quilt push -a && fakeroot debian/rules clean build binary && quilt pop -a
>>should work as usual, discarding that delta from the tarball
>>Cheers, and sorry for the "upload noise"
>>Gianfranco
>>Sent from Yahoo Mail on Android
>
>
>
>--
>
>GUO Yixuan
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/attachments/20140629/976bacec/attachment-0001.html>
More information about the pkg-boinc-devel
mailing list