<span style='font-family:Verdana'><span style='font-size:12px'><br />
<div>
<span style="font-family:Verdana"><span style="font-size:12px"><span style="font-family:verdana;"><span style="font-size:12px;">Dear all,<br />
<br />
I took the time "between the years" to address the boinc server side a bit more. That server side however for the more recent versions of boinc only compiles for the "trunk" or the version of the repository that is not tagged with a client release. And we were kindly asked to work from that max-current codebase for that server packages. Now, before I push anything to our alioth git repository, I thought I better get your comments on this setup. I took<br />
* upstream's git repository as the "master" branch<br />
* from there I branched into "upstream" - no further cleanups done on it, yet<br />
* into an orphaned branch "debian" of it I copied the debian directory from our pkg-boinc/boinc.git repository<br />
* a branch of(f) "master", named "working-with-debian" I merged with the "debian" branch into<br />
* a series of changes were required to get our patches adjusted - some could be removed, which is nice<br />
* worked on improved install instructions for the server side (which upstream today expects not to be installed anywhere beyond the checkout)<br />
* all changes were _not_ committed to "working-with-debian" but stashed and committed to a new branch of(f) the "debian" branch, named "debian-for-trunk"</span></span><br />
<br />
For the curious:<br />
* The boinc client of the trunk works nicely and does not show the issues of the 7.0.42 release in the boinc-manager.<br />
* boinc-app-seti crashes with the librararies it provides, and it needs a bit of a tweak to compile with it - Gianfranco has just kindly cleaned up my changes - many thanks! This strongly supports the need of static binaries for the scientific apps, I admit it.<br />
* I am now addressing (simplifying) the Debian side of the boinc-server-maker package<br />
<br />
Now, how should this work be fed back to our git repository? I would like to avoid too much of a redundancy with boinc-upstream's repository on our servers, even though this might be somewhat unavoidable with my limited understanding of the PPA auto-build instructions - Gianfranco? The only novelty is the "debian-for-trunk" branch and it could just sit as an orphan branch in our pkg-boinc/boinc.git repository as it is now. We would also need the "debian" branch to keep the differences between the two for future updates. But in a pure git repository for packaging we would have that pure debian branch already, anyway.<br />
<br />
We are bitten a bit by our heritage of the subversion exports that make our upstream folders, so we cannot just migrate quickly between the trunk /head and the tags of a particular release for the upstream code. Are there ideas on your side about it all?<br />
<br />
Kind regards,<br />
<br />
Steffen</span></span></div>
</span></span>