x2go-commits November 2012

x2go-commits@lists.x2go.org

1 participants
327 discussions

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.8-1-gee963a1
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, release/3.1.1.x has been updated via ee963a1ee7311fc770ce5950440eea66ced97b13 (commit) from 4218318fd0d5fe281be98eede39ef284da410a7f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ee963a1ee7311fc770ce5950440eea66ced97b13 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:07:07 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6e5e93e..962a2c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low + + * New upstream release (3.1.1.9): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100 + x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index bb994f9..3a154d4 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index bb994f9..3a154d4 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index bb994f9..3a154d4 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index bb994f9..3a154d4 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index bb994f9..3a154d4 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index bb994f9..3a154d4 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index bb994f9..3a154d4 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.8 \ No newline at end of file +3.1.1.9 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.8
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, build-main has been updated via 4218318fd0d5fe281be98eede39ef284da410a7f (commit) via bcbc438d86b8330755cb238ec626e8fb59cde59b (commit) via 90c6884f0433390f33716bb23e1570c2b6fda1a0 (commit) from 5af367fc604d6b08b8a375c4a2def544124c5abb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2goruncommand | 12 ++++++------ 9 files changed, 20 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e505384..6e5e93e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low + + * New bugfix release (3.1.1.8): + - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:01:01 +0100 + x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bugfix release (3.1.1.7): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 861a59a..bb994f9 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 861a59a..bb994f9 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 861a59a..bb994f9 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 861a59a..bb994f9 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 861a59a..bb994f9 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 861a59a..bb994f9 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 861a59a..bb994f9 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b7e0246..b88c3b9 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 11.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then export DESKTOP_SESSION="2d-gnome" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE <= 10.10 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo $DISTRIB_RELEASE == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.7-3-g4218318
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, release/3.1.1.x has been updated via 4218318fd0d5fe281be98eede39ef284da410a7f (commit) from bcbc438d86b8330755cb238ec626e8fb59cde59b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4218318fd0d5fe281be98eede39ef284da410a7f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:01:17 2012 +0100 release 3.1.1.8 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2751447..6e5e93e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low +x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 11:59:37 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:01:01 +0100 x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.7-2-gbcbc438
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, release/3.1.1.x has been updated via bcbc438d86b8330755cb238ec626e8fb59cde59b (commit) via 90c6884f0433390f33716bb23e1570c2b6fda1a0 (commit) from 5af367fc604d6b08b8a375c4a2def544124c5abb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bcbc438d86b8330755cb238ec626e8fb59cde59b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:00:53 2012 +0100 increment version commit 90c6884f0433390f33716bb23e1570c2b6fda1a0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 12:00:30 2012 +0100 Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2goruncommand | 12 ++++++------ 9 files changed, 20 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e505384..2751447 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low + + * New bugfix release (3.1.1.8): + - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 11:59:37 +0100 + x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bugfix release (3.1.1.7): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 861a59a..bb994f9 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 861a59a..bb994f9 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 861a59a..bb994f9 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 861a59a..bb994f9 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 861a59a..bb994f9 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 861a59a..bb994f9 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 861a59a..bb994f9 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b7e0246..b88c3b9 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 11.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then export DESKTOP_SESSION="2d-gnome" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE <= 10.10 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo $DISTRIB_RELEASE == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-104-g1520b78
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 1520b78b713ac0e33e72c40ae174f9d01fcad327 (commit) from 8df7c7aae88494c4017543320352f55c5297e2e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1520b78b713ac0e33e72c40ae174f9d01fcad327 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 11:41:54 2012 +0100 rebuild i18n files ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23590 -> 23590 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 25304 -> 25304 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 23676 -> 23676 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 25107 -> 25107 bytes build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 24017 -> 24017 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23858 -> 23858 bytes build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 29018 -> 29018 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23411 -> 23411 bytes po/PyHoca-GUI.pot | 22 +++++++++++----------- po/bg.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de.po | 22 +++++++++++----------- po/en.po | 22 +++++++++++----------- po/es.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/nb_NO.po | 22 +++++++++++----------- po/nl.po | 22 +++++++++++----------- po/ru.po | 22 +++++++++++----------- po/sv.po | 22 +++++++++++----------- 21 files changed, 121 insertions(+), 121 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index a2ee891..4755936 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo index b5315bc..ec883be 100644 Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 2dde32f..7b4d1f8 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index faee5a5..abbdde3 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index 1da93fa..a6597bd 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo index 8eee52f..80f9e8d 100644 Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 200d9c4..d905759 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index 77c7e50..56c0b02 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo index 93821b5..0350b6f 100644 Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 335768f..1d34910 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 2dd457b..400e3b3 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -736,8 +736,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "" @@ -906,35 +906,35 @@ msgstr "" msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "" diff --git a/po/bg.po b/po/bg.po index e3911c8..699ae7e 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" @@ -740,8 +740,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "" @@ -910,35 +910,35 @@ msgstr "" msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "" diff --git a/po/da.po b/po/da.po index 3bf04b7..416a8b5 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI 0.2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-08 12:25+0100\n" "Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n" "Language-Team: x2go-dev <x2go-dev(a)lists.berlios.de>\n" @@ -753,8 +753,8 @@ msgstr "Printerindstillinger" msgid "Client Options" msgstr "Klientparamentre" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "E&xit" @@ -923,35 +923,35 @@ msgstr "&Rens alle sessioner" msgid "Customize &profile" msgstr "Tilpas &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Afbryd forbindelse til Server" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Suspendér Session og L&uk applikation" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "Afbryd forbindese og L&uk programmet" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Tilføj Profil" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "Ingen sessionsprofiler er defineret" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Start/Genoptag Session" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Forbind Server" diff --git a/po/de.po b/po/de.po index 49a2a19..8096762 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-18 13:28+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" @@ -758,8 +758,8 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "&Beenden" @@ -928,35 +928,35 @@ msgstr "Alle Sitzungen beenden" msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Freigegebene Ordner" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Sitzung anhalten und Anwendung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "Verbindung Trennen und Anwendung schließen" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Serververbindung aufbauen" diff --git a/po/en.po b/po/en.po index 84585e9..d0fbdde 100644 --- a/po/en.po +++ b/po/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-18 13:27+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" @@ -753,8 +753,8 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "E&xit" @@ -923,35 +923,35 @@ msgstr "&Clean all sessions" msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Shared &folders" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Suspend Session and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "Disconnect and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Connect Server" diff --git a/po/es.po b/po/es.po index d8415f3..71d9a5c 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-04 16:50+0100\n" "Last-Translator: Ricardo Diaz <oceanosoftlapalma(a)gmail.com>\n" "Language-Team: Español; Castellano <>\n" @@ -769,8 +769,8 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "S&alir" @@ -939,35 +939,35 @@ msgstr "&Limpiar el registro de sesiones" msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Compartir &carpetas" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "Desconectar y Salir (e&xit) de la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Conectar con el Servidor" diff --git a/po/fr.po b/po/fr.po index 5329e68..9d3de1b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Renaud Gaudin <rgaudin(a)gmail.com>\n" @@ -740,8 +740,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "" @@ -910,35 +910,35 @@ msgstr "" msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 0f65f2d..7d89a30 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-03 23:02+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" @@ -759,8 +759,8 @@ msgstr "Utksriftsinnstillinger" msgid "Client Options" msgstr "Klient alternativer" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "&Avslutt" @@ -929,35 +929,35 @@ msgstr "&Rensk opp alle sesjoner" msgid "Customize &profile" msgstr "TIlpass &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Koble fra serveren" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Koble fra sesjonen og &Avslutt applikasjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "Koble fra sesjonen og &Avslutt applikasjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Legg til profil" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "Ingen sesjonsprofiler er definert" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Start/gjenoppta sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Koble til server" diff --git a/po/nl.po b/po/nl.po index 532eb79..36b850f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-06-10 21:16+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -753,8 +753,8 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "&Beeindigen" @@ -923,35 +923,35 @@ msgstr "Alle Sessies beëindigen" msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Delen &mappen" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Suspend Sessie en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "verbinding verbreken en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Verbinden met Server" diff --git a/po/ru.po b/po/ru.po index d8e3d44..c763d54 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-19 13:51+0100\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: Russian <x2go-i18n(a)lists.berlios.de>\n" @@ -761,8 +761,8 @@ msgstr "Установки печати" msgid "Client Options" msgstr "Опции клиента" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "Вы&ход" @@ -931,35 +931,35 @@ msgstr "&Очистить все сессии" msgid "Customize &profile" msgstr "Изменить &профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Экспорт &каталогов" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Отсоединить от сервера" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "&Прервать сессию и покинуть программу" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "&Разъединить и покинуть программу" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Добавить профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "Профили не определены" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Запуск/восстановление сессии" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Соединить с сервером" diff --git a/po/sv.po b/po/sv.po index 9a9eee6..306f755 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:47+0100\n" +"POT-Creation-Date: 2012-11-23 11:41+0100\n" "PO-Revision-Date: 2012-11-04 19:25+0100\n" "Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" @@ -757,8 +757,8 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:780 -#: ../pyhoca/wxgui/menus_taskbar.py:972 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "E&xit" msgstr "&Avsluta" @@ -927,35 +927,35 @@ msgstr "&Rensa alla sessioner" msgid "Customize &profile" msgstr "Anpassa &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:756 msgid "Shared &folders" msgstr "Delade &mappar" -#: ../pyhoca/wxgui/menus_taskbar.py:765 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "&Disconnect from Server" msgstr "&Koppla från server" -#: ../pyhoca/wxgui/menus_taskbar.py:772 +#: ../pyhoca/wxgui/menus_taskbar.py:775 msgid "Suspend Session and E&xit application" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:776 +#: ../pyhoca/wxgui/menus_taskbar.py:779 msgid "Disconnect and E&xit application" msgstr "Kopplar från och &avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:830 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "Add Profile" msgstr "Lägg till profil" -#: ../pyhoca/wxgui/menus_taskbar.py:906 +#: ../pyhoca/wxgui/menus_taskbar.py:909 msgid "No session profiles defined" msgstr "Inga sessionsprofiler har definierats" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Start/Resume Session" msgstr "Starta/återanslut session" -#: ../pyhoca/wxgui/menus_taskbar.py:942 +#: ../pyhoca/wxgui/menus_taskbar.py:945 msgid "Connect Server" msgstr "Anslut till server" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-88-g78a8ce9
by git-admin＠x2go.org 23 Nov '12

23 Nov '12

The branch, master has been updated via 78a8ce92518502a16c909b84a7987e1a3f858523 (commit) from 1d46f7b6adb1bf292e1e97b9ccb4ceeb46d6e1c7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 78a8ce92518502a16c909b84a7987e1a3f858523 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 23 11:14:58 2012 +0100 Before suspending/terminating a session, make sure that the list of shared folders is up-to-date. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 8 ++++++++ x2go/session.py | 1 + 3 files changed, 11 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 156035b..469efd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low condition). - Consolidating management of shared and unshared client-side folders. + - Before suspending/terminating a session, make sure that the list of + shared folders is up-to-date. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/client.py b/x2go/client.py index 142e970..8619e26 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1563,6 +1563,10 @@ class X2goClient(object): """ try: if session_name is None: + + # make sure that the current list of shared folders is up-to-date before the session suspends + self.get_shared_folders(session_uuid, check_list_mounts=True) + return self.session_registry(session_uuid).suspend(**sessionopts) else: for session in self.session_registry.running_sessions(): @@ -1605,6 +1609,10 @@ class X2goClient(object): """ try: if session_name is None: + + # make sure that the current list of shared folders is up-to-date before the session terminates + self.get_shared_folders(session_uuid, check_list_mounts=True) + return self.session_registry(session_uuid).terminate(**sessionopts) else: for session in self.session_registry.running_sessions() + self.session_registry.suspended_sessions(): diff --git a/x2go/session.py b/x2go/session.py index 752a5a7..a511ed9 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -2572,6 +2572,7 @@ class X2goSession(object): """ if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session(): + if force_all: retval = self.terminal_session.unshare_all_local_folders() if retval: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.7
by git-admin＠x2go.org 22 Nov '12

22 Nov '12

The branch, build-main has been updated via 5af367fc604d6b08b8a375c4a2def544124c5abb (commit) via a9ddc031895260e40e099417c15e32cd9d73a03d (commit) via e8d7700258f72ee991460b709a5f27ec2bdf8bce (commit) via ac44ee30911caecbde4d4b255c3df636400692d3 (commit) via 8ee633875ac5a916f7d060c3e518b69d0ff6073a (commit) via 5213ce605d9abaacf576e2df52891c047f2a8e1d (commit) from 623a4649daca7f1489b3441f44f24f5f58db2cfa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 +++++++++++ debian/control | 1 + x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2goruncommand | 19 +++++++++++-------- x2goserver/bin/x2goumount-session | 2 +- 5 files changed, 25 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6055676..e505384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low + + * New upstream+bugfix release (3.1.1.7): + - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch + command. + - Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number + and by using the bc command for comparing versions. + - Do not fail if source_environment() cannot find the file to be sourced. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 22 Nov 2012 18:11:15 +0100 + x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low * Bugfix release (3.1.1.6): diff --git a/debian/control b/debian/control index ba29b5a..f242c27 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Depends: ${misc:Depends}, x2goagent (>= 2:3.5.0.15-0~), lsof, + bc, openssh-client, openssh-server, libconfig-simple-perl, diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 457a1d3..8436219 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -38,7 +38,7 @@ sub source_environment { my $name = shift; open my $fh, "<", $name - or die "could not open $name: $!"; + or return -1; while (<$fh>) { chomp; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index d26fa82..b7e0246 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,14 +91,14 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^[a-m].*" >/dev/null; then - export DESKTOP_SESSION="gnome" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^n.*" >/dev/null; then - export DESKTOP_SESSION="2d-gnome" - args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 11.10 | bc); then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then + export DESKTOP_SESSION="2d-gnome" + args=" --session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE <= 10.10 | bc); then + export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then @@ -108,10 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 12.10 | bc); then + export DESKTOP_SESSION="ubuntu" + args=" --session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo $DISTRIB_RELEASE == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^n.*" >/dev/null; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index ca52174..33ffc01 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -41,7 +41,7 @@ sub source_environment { my $name = shift; open my $fh, "<", $name - or die "could not open $name: $!"; + or return -1; while (<$fh>) { chomp; hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.6-6-g5af367f
by git-admin＠x2go.org 22 Nov '12

22 Nov '12

The branch, release/3.1.1.x has been updated via 5af367fc604d6b08b8a375c4a2def544124c5abb (commit) from a9ddc031895260e40e099417c15e32cd9d73a03d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5af367fc604d6b08b8a375c4a2def544124c5abb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 22 18:11:30 2012 +0100 release 3.1.1.7 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bf93f75..e505384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bugfix release (3.1.1.7): - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch @@ -7,7 +7,7 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low and by using the bc command for comparing versions. - Do not fail if source_environment() cannot find the file to be sourced. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Nov 2012 09:28:32 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 22 Nov 2012 18:11:15 +0100 x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-87-g1d46f7b
by git-admin＠x2go.org 22 Nov '12

22 Nov '12

The branch, master has been updated via 1d46f7b6adb1bf292e1e97b9ccb4ceeb46d6e1c7 (commit) from f7bffc7d1e9e8c64a3e01e3c79ec8a94ed7b4970 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1d46f7b6adb1bf292e1e97b9ccb4ceeb46d6e1c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 22 15:01:42 2012 +0100 fix add_profile in X2goSessionProfilesFILE, thanks to Dick Kniep for noticing this issue ----------------------------------------------------------------------- Summary of changes: x2go/backends/profiles/_file.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 24c2912..eb21f61 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -386,7 +386,10 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): @type value: any type, depends on the session profile option """ - profile_id = self.check_profile_id_or_name(section) + try: + profile_id = self.check_profile_id_or_name(section) + except X2goProfileException: + profile_id = section if key == 'name': profile_name = value current_profile_name = self.get_value(profile_id, key) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

x2gobroker.git - master (branch) updated: 57030875e10c269c360ac2b1c1623b9f427d6714
by git-admin＠x2go.org 21 Nov '12

21 Nov '12

The branch, master has been updated via 57030875e10c269c360ac2b1c1623b9f427d6714 (commit) via 00034ba69ecca2523dc6ad1b5b16f9952508683c (commit) via 14f559e001506c6aefb74a8c8c74470ab2dc3963 (commit) via 3acbb6d354fe3421197a568004bb135c7b6612bf (commit) via 241a6ba9de4baaa0fda547636ce29578c24ff5bd (commit) from 1f3029121c54e02b5db037f448dfa79435702b6b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 57030875e10c269c360ac2b1c1623b9f427d6714 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 21 17:02:54 2012 +0100 start serious work on the zeroconf broker commit 00034ba69ecca2523dc6ad1b5b16f9952508683c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 21 17:02:38 2012 +0100 Make sure libx2go-broker-perl of the same version gets installed with x2gobroker-common. Add dependencies: libauthen-pam-perl, libauthen-simple-pam-perl. commit 14f559e001506c6aefb74a8c8c74470ab2dc3963 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 13 19:55:22 2012 +0100 fix x2gobroker-common.install commit 3acbb6d354fe3421197a568004bb135c7b6612bf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 13 19:53:27 2012 +0100 Using our own PAM service ,,x2gobroker''. commit 241a6ba9de4baaa0fda547636ce29578c24ff5bd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 13 19:51:33 2012 +0100 fix project name ----------------------------------------------------------------------- Summary of changes: X2Go/Broker/ZeroConf.pm | 50 ++++++++++++++++++++++---------------- cgi/x2gobroker.cgi | 14 +++++------ debian/changelog | 6 ++++- debian/control | 3 +++ debian/x2gobroker-common.install | 2 +- debian/x2gobroker.pam | 2 ++ lib/x2gobroker-agent.pl | 6 ++--- 7 files changed, 49 insertions(+), 34 deletions(-) create mode 100644 debian/x2gobroker.pam The diff of changes is: diff --git a/X2Go/Broker/ZeroConf.pm b/X2Go/Broker/ZeroConf.pm index 0655191..da4eb98 100644 --- a/X2Go/Broker/ZeroConf.pm +++ b/X2Go/Broker/ZeroConf.pm @@ -21,7 +21,7 @@ package X2Go::Broker::ZeroConf; use strict; -use Sys:Hostname; +use Sys::Hostname; use Authen::PAM; use Authen::Simple::PAM; use X2Go::Broker::Common; @@ -38,13 +38,16 @@ my $hostname = hostname; ### public functions, available to broker cgi ### +my $username; +my $password; + ### exported function ### sub CheckAccess { # zeroconf broker: use PAM to perform authentication against # the local PAM login module - my ($user,$pass)=@_; - my $pam = Authen::Simple::PAM->new(service => 'login'); + ($username, $password)=@_; + my $pam = Authen::Simple::PAM->new(service => 'x2gobroker'); if ( $pam->authenticate( $username, $password ) ) { # successfull authentication return 0 @@ -63,11 +66,11 @@ sub SetPass my ($username, $oldpassword, $newpassword)=@_; # zeroconf broker: use PAM to initiate a local passwd change - my $service = "passwd"; - ref($pamh = new Authen::PAM($service, $username, \&passwd_conv_func)) || - die "Error code $pamh during PAM init!"; - $state = 0; - $res = $pamh->pam_chauthtok; + my $service = "x2gobroker"; + my $pamh = new Authen::PAM($service, $username, \&passwd_conv_func) || + die "Error code \$pamh during PAM init!"; + my $state = 0; + my $res = $pamh->pam_chauthtok; die $pamh->pam_strerror($res) unless $res == PAM_SUCCESS(); print "\n CHANGING PASS OK \n"; @@ -76,16 +79,16 @@ sub SetPass ### exported function ### sub SelectSession { - my ($user, $sid)=@_; - my @words=split("\@",$sid); + my ($user, $session_id)=@_; + my @words=split("\@",$session_id); ### - ### FIXME: why the heck is the $sid format <host>@<session>, + ### FIXME: why the heck is the $session_id format <host>@<session>, ### <session>@<host> would make much more sense!!! (for ### the human eye...) ### - my $sess_id=@words[1]; + my $session_id=@words[1]; my $host=@words[0]; - check_and_start_session($user, $host, $sess_id); + check_and_start_session($user, $host, $session_id); } ### exported function ### @@ -93,15 +96,15 @@ sub ListSessions { # print Dumper($message->entries); print "START_USER_SESSIONS "; - my($status,$sessions)=CallBrokerAgent($hostname, $user, 'listsessions'); + my($status,$sessions)=CallBrokerAgent($hostname, $username, 'listsessions'); if ( $status ) { if($sessions) { my @sinfo = split("\\|",$sessions); my $session_status = @sinfo[4]; - my $sid = @sinfo[1]; - print " [$hostname\@$sid] "; + my $session_id = @sinfo[1]; + print " [$hostname\@$session_id] "; print "status=$session_status "; } else { print " [$hostname] "; @@ -121,6 +124,10 @@ sub passwd_conv_func { my $code = shift; my $msg = shift; my $ans = ""; + my $state; + + my $oldpassword; + my $newpassword; $ans = $username if ( $code == PAM_PROMPT_ECHO_ON() ); if ( $code == PAM_PROMPT_ECHO_OFF() ) { @@ -137,8 +144,9 @@ sub passwd_conv_func { sub check_and_start_session { - my ($uid, $host, $sid) = @_; - my ($status, $sessions)=ExecRemoteBroker($user, $hostname, 'listsessions'); + my ($username, $hostname, $session_id) = @_; + my $running; + my ($status, $sessions)=ExecRemoteBroker($username, $hostname, 'listsessions'); if ( ! $status ) { print "ERROR: X2Go server not available\n"; @@ -151,12 +159,12 @@ sub check_and_start_session my @sinfo = split("\\|",$sessions); my $session_status = @sinfo[4]; my $session_server = @sinfo[3]; - $sid=@sinfo[1]; + $session_id=@sinfo[1]; if( $session_status eq 'R' ) { $running = 1; my $str; - ($status, $str) = ExecRemoteBroker($uid, $hostname, "suspend $sid"); + ($status, $str) = ExecRemoteBroker($username, $hostname, "suspend $session_id"); $sessions =~ s/\|R\|/\|S\|/; } if( $session_status eq 'S' ) @@ -165,7 +173,7 @@ sub check_and_start_session } } - print "SERVER:$hostname:$port\n"; + print "SERVER:$hostname\n"; if($running) { # use first session in session list... diff --git a/cgi/x2gobroker.cgi b/cgi/x2gobroker.cgi index 06ed66b..3d44d52 100755 --- a/cgi/x2gobroker.cgi +++ b/cgi/x2gobroker.cgi @@ -24,15 +24,13 @@ use strict; use File::Basename qw(basename); my $cgi_name = basename($0); -my $broker_backend ~= s/x2gobroker-(.*)\.cgi/\1/ +my $broker_backend = $cgi_name; +$broker_backend =~ s/x2gobroker-(.*)\.cgi/\1/; -use lib "/usr/lib/x2go/"; -use lib "/usr/lib/x2go/broker/"; - -switch ( $broker_backend ) { - case 'zeroconf' { use X2Go::Broker::ZeroConf qw(CheckAccess SetPass SelectSession ListSessions) } - case 'simple' { use X2Go::Broker::Simple qw(CheckAccess SetPass SelectSession ListSessions) } - case 'ldap' { use X2Go::Broker::LDAP qw(CheckAccess SetPass SelectSession ListSessions) } +SWITCH: { + $broker_backend == "zeroconf" && do { use X2Go::Broker::ZeroConf qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; +# $broker_backend == "simple" && do { use X2Go::Broker::Simple qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; +# $broker_backend == "ldap" && do { use X2Go::Broker::LDAP qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; } use CGI; diff --git a/debian/changelog b/debian/changelog index ce356c8..42e3641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] - * Setting up new public X2Go project: x2gohttpbroker. + * Setting up new public X2Go project: x2gobroker. + - Using our own PAM service ,,x2gobroker''. * /debian/control: + Add an initial dependency selection to the various Depends fields. + + Make sure libx2go-broker-perl of the same version gets installed + with x2gobroker-common. + + Add dependencies: libauthen-pam-perl, libauthen-simple-pam-perl. * Fix code indentations (spaces replaced by tabs, use proper indentation levels). diff --git a/debian/control b/debian/control index c58792f..3381442 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Package: x2gobroker-common Architecture: all Depends: ${misc:Depends}, + libx2go-broker-perl (>= ${source:Version}), libx2go-broker-perl (<< ${source:Version}.1~), Description: X2Go http(s) based session broker (common files) X2Go is a serverbased computing environment with - session resuming @@ -133,6 +134,8 @@ Depends: apache2 | httpd, perl, x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~), + libauthen-pam-perl, + libauthen-simple-pam-perl, Description: X2Go http(s) session broker (for demo purposes only) X2Go is a serverbased computing environment with - session resuming diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install index 59f3588..e9793a9 100644 --- a/debian/x2gobroker-common.install +++ b/debian/x2gobroker-common.install @@ -1 +1 @@ -cgi/x2gobroker.cgi usr/lib/cgi-bin/ \ No newline at end of file +cgi/x2gobroker.cgi usr/lib/cgi-bin/ diff --git a/debian/x2gobroker.pam b/debian/x2gobroker.pam new file mode 100644 index 0000000..1eaad76 --- /dev/null +++ b/debian/x2gobroker.pam @@ -0,0 +1,2 @@ +@include common-auth +@include common-passwd diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 02b6b04..0d5b559 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -95,7 +95,7 @@ if($mode eq 'listsessions') { InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; - system "/bin/su", $name, "-c", "x2golistsessions --all-servers"; + system "/bin/su - ", $name, "-c", "x2golistsessions --all-servers"; } @@ -103,7 +103,7 @@ if($mode eq 'getservers') { InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; - system "/bin/su", $name, "-c", "x2gogetservers"; + system "/bin/su - ", $name, "-c", "x2gogetservers"; } if($mode eq 'key') @@ -118,7 +118,7 @@ if($mode eq 'suspend') InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; my $sid=shift; - system "/bin/su", $name, "-c", "x2gosuspend-session $sid"; + system "/bin/su - ", $name, "-c", "x2gosuspend-session $sid"; } if($mode eq 'ping') hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2012