Hi,
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
- nxproxy
x2goagent is still missing, and this is a bit hairy. In order to find out what has been actually changed compared to NX, I've compared the sources in nxagent-3.4.0-5.tar.gz to what we ship in x2goagent. Here, I noticed that 'our' x2goagent tarball actually combines several NX 'upstream' tarballs, among others 'nxagent' and 'nx-x11'. It is not totally clear to me what tarballs have been exactly used to construct the x2goagent sources.
As for modifications, I've grepped through all sources for 'x2go' markers, and compared those files against the NX version. Find the diff attached to this e-mail. Alex, do you remember any additional changes that have been done to the NX sources?
As comparison, I've had a look what the freenx team is doing [1]. It seems that they have had similar problems and also combined several tarballs into the source package 'nx-x11'. Feel free to check.
[1] https://launchpad.net/~freenx-team/+archive/ppa/+packages
So, how to upgrade all this mess? Well, TBH, I think the FreeNX guys are doing a great job with their package. They have accumulated a fair number of patches (18 to my counting) so far, which are mostly undocumented but generally look reasonable on the first glance. I think it would make sense to consider using their 'nx-x11' package as basis for x2goagent and add the x2go modification as additional patch to that package.
Comments/Flames welcome.
-- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4
Hi Reinhard,
On Mi 29 Jun 2011 16:52:47 CEST Reinhard Tartler wrote:
Hi,
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
- nxproxy
Very great so far!!!
x2goagent is still missing, and this is a bit hairy. In order to find out what has been actually changed compared to NX, I've compared the sources in nxagent-3.4.0-5.tar.gz to what we ship in x2goagent. Here, I noticed that 'our' x2goagent tarball actually combines several NX 'upstream' tarballs, among others 'nxagent' and 'nx-x11'. It is not totally clear to me what tarballs have been exactly used to construct the x2goagent sources.
As for modifications, I've grepped through all sources for 'x2go' markers, and compared those files against the NX version. Find the diff attached to this e-mail. Alex, do you remember any additional changes that have been done to the NX sources?
As comparison, I've had a look what the freenx team is doing [1]. It seems that they have had similar problems and also combined several tarballs into the source package 'nx-x11'. Feel free to check.
[1] https://launchpad.net/~freenx-team/+archive/ppa/+packages
So, how to upgrade all this mess? Well, TBH, I think the FreeNX guys are doing a great job with their package. They have accumulated a fair number of patches (18 to my counting) so far, which are mostly undocumented but generally look reasonable on the first glance. I think it would make sense to consider using their 'nx-x11' package as basis for x2goagent and add the x2go modification as additional patch to that package.
Comments/Flames welcome.
Alex has already patched/upgraded x2goagent to version 3.5.0.x by
incorporating nxagent 3.5.0-x. Unfortunately, not yet in Git.
The current plan is (telephone session with Heinz yesterday) that he
will send me his work at the weekend and I would then upload his code
to x2goagent.git (if that is fine by you). Maybe then, we should take
individual looks at the freenx patches?!?
Would that work for you? Sorry for overlaps at this point!!!
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On Wed, Jun 29, 2011 at 20:57:48 (CEST), Mike Gabriel wrote:
Hi Reinhard,
On Mi 29 Jun 2011 16:52:47 CEST Reinhard Tartler wrote:
Hi,
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
- nxproxy
Very great so far!!!
x2goagent is still missing, and this is a bit hairy. In order to find out what has been actually changed compared to NX, I've compared the sources in nxagent-3.4.0-5.tar.gz to what we ship in x2goagent. Here, I noticed that 'our' x2goagent tarball actually combines several NX 'upstream' tarballs, among others 'nxagent' and 'nx-x11'. It is not totally clear to me what tarballs have been exactly used to construct the x2goagent sources.
As for modifications, I've grepped through all sources for 'x2go' markers, and compared those files against the NX version. Find the diff attached to this e-mail. Alex, do you remember any additional changes that have been done to the NX sources?
As comparison, I've had a look what the freenx team is doing [1]. It seems that they have had similar problems and also combined several tarballs into the source package 'nx-x11'. Feel free to check.
[1] https://launchpad.net/~freenx-team/+archive/ppa/+packages
So, how to upgrade all this mess? Well, TBH, I think the FreeNX guys are doing a great job with their package. They have accumulated a fair number of patches (18 to my counting) so far, which are mostly undocumented but generally look reasonable on the first glance. I think it would make sense to consider using their 'nx-x11' package as basis for x2goagent and add the x2go modification as additional patch to that package.
Comments/Flames welcome.
Alex has already patched/upgraded x2goagent to version 3.5.0.x by incorporating nxagent 3.5.0-x. Unfortunately, not yet in Git.
The current plan is (telephone session with Heinz yesterday) that he will send me his work at the weekend and I would then upload his code to x2goagent.git (if that is fine by you). Maybe then, we should take individual looks at the freenx patches?!?
Would that work for you? Sorry for overlaps at this point!!!
So far I see no overlap, yet. However, I'm curious what Alex did exactly for upgrading to 3.5.0-1, and how the x2goagent tarball is exactly constructed.
Moreover, shall I (already) push the four git branchs that I have locally here?
-- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4
Hi Reinhard,
On Mi 29 Jun 2011 21:02:47 CEST Reinhard Tartler wrote:
Would that work for you? Sorry for overlaps at this point!!!
So far I see no overlap, yet.
Ah, Ok! Great!
However, I'm curious what Alex did exactly for upgrading to 3.5.0-1, and how the x2goagent tarball is exactly
constructed.
Me too! I have taken a look at x2goagent/nxagent (3.5.x) two weeks ago
and I was not at all sure what to patch in what direction (in or
out)... So, let's see.
Moreover, shall I (already) push the four git branchs that I have locally here?
See my other mail: yes, in a branch first (my vote).
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hi Reinhard,
On Mi 29 Jun 2011 21:08:16 CEST Mike Gabriel wrote:
Moreover, shall I (already) push the four git branchs that I have locally here?
See my other mail: yes, in a branch first (my vote).
I have just tagged nano-releases on all NX projects (apart from
x2goagent) in X2go Git. I have also updated the build-main branch so
that we have a marker for the last state of NX 3.4.0.x code in X2go Git.
Thus, I think it is also fine to push directly to master? Hope you
haven't moved things in a branch, yet.
As I hope for Alex sending me x2goagent sources today or tomorrow it
would be great to have your nx 3.5.* changes in Git as well ASAP.
THANKS!!! Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hi Reinhard,
On Mi 29 Jun 2011 21:02:47 CEST Reinhard Tartler wrote:
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
Another question: have you already taken a look at Debian's new
multi-arch feature? Does that have any consequences for our package
building process (that is: for the nx libs we build)??? If so, do you
already have a clue what in detail?
Salut, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hi Reinhard,
On Mi 29 Jun 2011 16:52:47 CEST Reinhard Tartler wrote:
Hi,
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
- nxproxy
There is nothing there yet... Could you push your changes to
code.x2go.org (into a branch first)?
Thanks, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On Wed, Jun 29, 2011 at 21:02:39 (CEST), Mike Gabriel wrote:
Hi Reinhard,
On Mi 29 Jun 2011 16:52:47 CEST Reinhard Tartler wrote:
Hi,
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
- nxproxy
There is nothing there yet... Could you push your changes to code.x2go.org (into a branch first)?
! [remote rejected] master -> master (hook declined)
For this task, I had to do merges. At the time we've discussed the hooks, we didn't anticipate that there would be future code drops fron nomachine. However, this has changed. Therefore, please disable the merge checks for these four branches.
Cheers, Reinhard
-- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4
On Do 30 Jun 2011 16:37:14 CEST Reinhard Tartler wrote:
There is nothing there yet... Could you push your changes to code.x2go.org (into a branch first)?
! [remote rejected] master -> master (hook declined)
For this task, I had to do merges. At the time we've discussed the hooks, we didn't anticipate that there would be future code drops fron nomachine. However, this has changed. Therefore, please disable the merge checks for these four branches.
try now... After your pushes can I revert to non-merge commits only or
do we have to keep the merge option enabled?
Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On Thu, Jun 30, 2011 at 16:56:36 (CEST), Mike Gabriel wrote:
On Do 30 Jun 2011 16:37:14 CEST Reinhard Tartler wrote:
There is nothing there yet... Could you push your changes to code.x2go.org (into a branch first)?
! [remote rejected] master -> master (hook declined)
For this task, I had to do merges. At the time we've discussed the hooks, we didn't anticipate that there would be future code drops fron nomachine. However, this has changed. Therefore, please disable the merge checks for these four branches.
try now... After your pushes can I revert to non-merge commits only or do we have to keep the merge option enabled?
I'd say let's allow merges for these four repos only. You seen to want to get rid of them anyway.
-- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4
On Do 30 Jun 2011 17:01:35 CEST Reinhard Tartler wrote:
You seen to want to get rid of them anyway.
in the long run... Yes.
Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hi all,
Cc:-ing to x2go-user for information, discussion thread takes place on
x2go-dev, please.
On Do 30 Jun 2011 17:01:35 CEST Reinhard Tartler wrote:
try now... After your pushes can I revert to non-merge commits only or do we have to keep the merge option enabled?
I'd say let's allow merges for these four repos only. You seen to want to get rid of them anyway.
Reinhard has uploaded 3.5.x version of nxproxy, nxcomp, nxcompext,
nxcompshad to X2go Git.
To pertain the former 3.4.0.x versions on packages.x2go.org (main) and
on Launchpad (ppa:x2go/stable) I have moved packages appropriately.
The 3.5.x versions of NX libs + proxy + x2goagent (later today or
tomorrow, at the latest on Saturday) will be in the nightly builds
only for quite a while, only. This code will be for our upcoming
Baikal release and it is still in heavy testing state (esp. x2goagent).
If you, by some reason, install your systems from the nightly builds,
it is NOW time to change-over:::
Debian: deb http://packages.x2go.org/debian squeeze main
Ubuntu: add-apt-repository ppa:x2go/stable
Thanks and greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hi Reinhard, all,
On Do 30 Jun 2011 16:37:14 CEST Reinhard Tartler wrote:
I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:
- nxcomp
- nxcompext
- nxcompshad
- nxproxy
There is nothing there yet... Could you push your changes to code.x2go.org (into a branch first)?
packages for Debian have built and are available on packages.x2go.org
(heuler area) for Download. Ubuntu packages will build on Launchpad
some time tonight (ppa:x2go/ppa).
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
-
Mike Gabriel -
Reinhard Tartler