Hi Michael,
On Mi 09 Jul 2014 16:42:27 CEST, Mike Gabriel wrote:
Hi Michael,
On Mi 09 Jul 2014 16:17:10 CEST, Michael DePaulo wrote:
Hi guys,
So Stefan Baur mentioned that he cannot deploy X2Go Client 4.0.2.0 for Windows to his clients right now without these 2 commits, and preferably the 3rd commit also. He has been waiting for 4.0.2.1 for this reason:
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=b1246af262afde6a986a...
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=18f4c677a7d9057ec5f4...
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=0ebe95fc2fa15a61ccbe...
I mentioned that I could probably easily rebuild 4.0.2.0 for Windows with those 3 commits cherry-picked.
May I create a new branch to do this work and push the branch to code.x2go.org? I will update the version string too. I will also make the builds available to everyone on code.x2go.org/releases/, probably under a separate folder. (It will not be the default Windows version.) If you'd like me to name the branch a certain way, let me know.
-Mike
Actually, this is a nice way to go for X2Go Client 4.0.2.1.
Please cherry-pick the needed commits to a branch named
release-4.0.2.x. We will move everything else on master targetting
for 4.0.3.0.I will look into the commit history and recommend other commits for
cherry-picking.Greets, Mike
Please branch of the release-4.0.2.x branch at this commit [1]
git checkout -b 6d3998f69cf9a7350e3d53de25965c8b2ccca2b5
Then cherry-pick chronologically:
o everything you committed which is necessary for a good Windows
build of X2Go Client
o these commits from me [2, 3]
o this commit from Alex [4]
o plus the commits you mentioned above
Note: you will get conflicts in debian/changelog for every
cherry-pick. That is normal with the changelog handling as we do it
now (we commit patch + changelog entry, so cherry-picking will break
mostly).
Once the branch is created, I will release X2Go Client right away
before my holidays.
Last, please update the changelog on the master branch to reflect the
cherry-picking. All changelog items on the master branch that we did
not cherry-pick to release-4.0.2.x branch should be moved to a new
changelog stanza for X2Go Client 4.0.3.0. Thanks!
Greets, Mike
[1]
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=6d3998f69cf9a7350e3d...
[2]
http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=0ebe95fc2fa15a61...
[3]
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=e064e1ae22ec8d8478fa...
[4]
http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=f8464c490c9d311a...
--
DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...