x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

x2goserver.git - master (branch) updated: 3.0.99.10-25-gcefc9b0
by git-admin＠x2go.org 21 Feb '12

21 Feb '12

The branch, master has been updated via cefc9b0522ff5a9c5b996263961c94d8b5a56e62 (commit) from cc498e94b2e95ac0c4ef92a01732906065b25e8d (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 cefc9b0522ff5a9c5b996263961c94d8b5a56e62 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 21 14:35:56 2012 +0100 remove one quotation pair in x2gostartagent ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 486451b..5ad0e79 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -244,7 +244,7 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ "$XDMCPOPT" -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & 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 - master (branch) updated: 3.0.99.10-24-gcc498e9
by git-admin＠x2go.org 21 Feb '12

21 Feb '12

The branch, master has been updated via cc498e94b2e95ac0c4ef92a01732906065b25e8d (commit) from 3650aefe3e6399040a0fff6ccf5d174ab1d3b65d (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 cc498e94b2e95ac0c4ef92a01732906065b25e8d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 21 14:28:50 2012 +0100 Fix call to x2goterminate-desktopsharing in x2goruncommand. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4b47309..56dde28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - For x2gomountdirs / x2goumount-session allow other TMP paths than /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. - Place quotations where appropriate into shell scripts. + - Fix call to x2goterminate-desktopsharing in x2goruncommand. * Let x2goserver package suggest x2goserver-fmbindings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index a7cbbda..7370c38 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -160,7 +160,7 @@ else fi # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate "$X2GO_SESSION" || true +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2goterminate-desktopsharing "$X2GO_SESSION" || true kill -TERM $X2GO_AGENT_PID $X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION" > /dev/null 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 - master (branch) updated: 3.0.99.10-23-g3650aef
by git-admin＠x2go.org 21 Feb '12

21 Feb '12

The branch, master has been updated via 3650aefe3e6399040a0fff6ccf5d174ab1d3b65d (commit) from 9da2c4d6265d79db87121bb529901759f3c2af4f (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 3650aefe3e6399040a0fff6ccf5d174ab1d3b65d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 21 14:22:21 2012 +0100 Place quotations where appropriate into shell scripts. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../bin/x2goserver-run-extensions | 6 +- x2goserver-pyhoca/bin/x2gosetkeyboard | 10 ++-- x2goserver/bin/x2gocmdexitmessage | 2 +- x2goserver/bin/x2gofeature | 2 +- x2goserver/bin/x2goresume-session | 54 +++++++------- x2goserver/bin/x2goruncommand | 26 ++++---- x2goserver/bin/x2gostartagent | 72 ++++++++++---------- x2goserver/bin/x2gosuspend-session | 20 +++--- x2goserver/bin/x2goterminate-session | 20 +++--- x2goserver/bin/x2goversion | 2 +- 11 files changed, 108 insertions(+), 107 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 24be3ea..4b47309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority). - For x2gomountdirs / x2goumount-session allow other TMP paths than /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. + - Place quotations where appropriate into shell scripts. * Let x2goserver package suggest x2goserver-fmbindings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 3df2066..c7b671c 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -27,13 +27,13 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_SESSION=$1 -X2GO_MODALITY=$2 +X2GO_SESSION="$1" +X2GO_MODALITY="$2" # scan extensions and execute them find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" - $x2go_extension $X2GO_SESSION &>/dev/null && { + $x2go_extension "$X2GO_SESSION" &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" } || { $X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..." diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard index 26a50f8..481d01a 100755 --- a/x2goserver-pyhoca/bin/x2gosetkeyboard +++ b/x2goserver-pyhoca/bin/x2gosetkeyboard @@ -38,11 +38,11 @@ test -f ${X2GO_CLIENT_KBD_FILE} || exit 0 read_keyboard_file() { # retrieve keyboard settings from keyboard file in X2Go session dir - XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_RULES="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_MODEL="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_LAYOUT="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_VARIANT="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_OPTIONS="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" } diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index a8e122b..e8002ee 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -28,4 +28,4 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)" # return command output of the command that was issued by x2goruncommand -cat $MESSAGE_FILE +cat "$MESSAGE_FILE" diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index 997418e..f379070 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -30,7 +30,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 # run x2gofeature scripts of X2Go extensions -test -d $X2GO_SHARE_PATH/x2gofeature.d && { +test -d "$X2GO_SHARE_PATH/x2gofeature.d" && { for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do $subscript $@ && exit 0 done diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 009fd1d..cd856a5 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -20,25 +20,25 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -SESSION_NAME=$1 -X2GO_GEOMETRY=$2 -X2GO_LINK=$3 -X2GO_PACK=$4 -X2GO_KBD_LAYOUT=$5 -X2GO_KBD_TYPE=$6 -X2GO_SET_KBD=$7 +SESSION_NAME="$1" +X2GO_GEOMETRY="$2" +X2GO_LINK="$3" +X2GO_PACK="$4" +X2GO_KBD_LAYOUT="$5" +X2GO_KBD_TYPE="$6" +X2GO_SET_KBD="$7" X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` -X2GO_ROOT=${HOME}/.x2go +X2GO_ROOT="${HOME}/.x2go" X2GO_RESIZE=0 X2GO_FULLSCREEN=0 -NX_XINERAMA_CONF=$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf -if [ -e $NX_XINERAMA_CONF ] +NX_XINERAMA_CONF="$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf" +if [ -e "$NX_XINERAMA_CONF" ] then - rm $NX_XINERAMA_CONF + rm "$NX_XINERAMA_CONF" fi $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" @@ -70,17 +70,17 @@ SYSTEM_PORTS=`netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++ #check if saved in DB ports free if grep -q "|${GR_PORT}|" <<<$SYSTEM_PORTS ; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $GR_PORT is already in use" - $X2GO_LIB_PATH/x2gormport $HOSTNAME $SESSION_NAME $GR_PORT + $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$GR_PORT" GR_PORT="" fi if grep -q "|${SOUND_PORT}|" <<<$SYSTEM_PORTS ; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $SOUND_PORT is already in use" - $X2GO_LIB_PATH/x2gormport $HOSTNAME $SESSION_NAME $SOUND_PORT + $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$SOUND_PORT" SOUND_PORT="" fi if grep -q "|${FS_PORT}|" <<<$SYSTEM_PORTS ; then - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $FS_PORT is already in use" - $X2GO_LIB_PATH/x2gormport $HOSTNAME $SESSION_NAME $FS_PORT + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port "$FS_PORT" is already in use" + $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$FS_PORT" FS_PORT="" fi @@ -104,16 +104,16 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d fi done if [ "$GR_PORT" == "" ]; then - GR_PORT=$SSH_PORT + GR_PORT="$SSH_PORT" elif [ "$SOUND_PORT" == "" ]; then - SOUND_PORT=$SSH_PORT + SOUND_PORT="$SSH_PORT" else - FS_PORT=$SSH_PORT + FS_PORT="$SSH_PORT" fi done -SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME} +SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" OPTIONS=`cat ${SESSION_DIR}/options` GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` @@ -144,24 +144,24 @@ NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` if [ "$X2GO_CLIENT" == "" ] then - X2GO_CLIENT=$HOSTNAME + X2GO_CLIENT="$HOSTNAME" fi -echo "$NEWOPTIONS" >${SESSION_DIR}/options +echo "$NEWOPTIONS" >"${SESSION_DIR}/options" -$X2GO_LIB_PATH/x2goresume $X2GO_CLIENT $SESSION_NAME $GR_PORT $SOUND_PORT $FS_PORT > /dev/null +$X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null # run x2goserver-extensions for pre-resume -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-resume || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-resume || true kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # resume x2godesktopsharing, if it has been in use before the session got suspended - x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing $SESSION_NAME || true + x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing "$SESSION_NAME" || true # run x2goserver-extensions for post-resume - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-resume || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-resume || true } || { err_msg="ERROR: failed to resume session with ID $SESSION_NAME" @@ -170,10 +170,10 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { # If we reach here it means that the x2goagent process of the session has vanisshed # If this happens than we mark the session as finished... - $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null + $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-resume - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-resume || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-resume || true } diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 451ee59..a7cbbda 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -36,11 +36,11 @@ export X2GO_AGENT_PID export X2GO_SESSION cmd=`echo $cmd |sed 's/X2GO_SPACE_CHAR/ /g'` -X2GO_ROOT=${HOME}/.x2go -MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput -echo "exec $cmd" >> $MESSAGE_FILE +X2GO_ROOT="${HOME}/.x2go" +MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput" +echo "exec $cmd" >> "$MESSAGE_FILE" -NX_XINERAMA_CONF=$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf +NX_XINERAMA_CONF="$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf" export NX_XINERAMA_CONF # make Kerberos's ticket cache known inside the X2Go session @@ -52,7 +52,7 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -test -n $LD_LIBRARY_PATH && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH=$NX_XINERAMA_LIBS +test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS" export LD_LIBRARY_PATH if [ "$sndsys" == "esd" ]; then @@ -123,7 +123,7 @@ then fi # run x2goserver-extensions for pre-runcommand -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-runcommand || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-runcommand || true sucessful_run=false if [ "$EXEC" != "" ] && [ -x $EXEC ]; then @@ -148,26 +148,26 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then successful_run=true # run x2goserver-extensions for post-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-runcommand || true else $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute" - echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE + echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > "$MESSAGE_FILE" # run x2goserver-extensions for fail-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-runcommand || true fi # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $X2GO_SESSION || true +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate "$X2GO_SESSION" || true kill -TERM $X2GO_AGENT_PID -$X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null +$X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION" > /dev/null export HOSTNAME -x2goumount-session $X2GO_SESSION +x2goumount-session "$X2GO_SESSION" # clean up session dir if not in debug mode and if session has been successful if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then - (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)& + (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index fe1ccee..486451b 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -27,21 +27,21 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 -X2GO_ROOT=${HOME}/.x2go +X2GO_ROOT="${HOME}/.x2go" REMOTE=localhost X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" -X2GO_GEOMETRY=$1; shift -X2GO_LINK=$1; shift -X2GO_PACK=$1; shift -X2GO_TYPE=$1; shift -X2GO_KBD_LAYOUT=$1; shift -X2GO_KBD_TYPE=$1; shift -X2GO_SET_KBD=$1; shift -X2GO_STYPE=$1; shift -X2GO_CMD=$1; shift +X2GO_GEOMETRY="$1"; shift +X2GO_LINK="$1"; shift +X2GO_PACK="$1"; shift +X2GO_TYPE="$1"; shift +X2GO_KBD_LAYOUT="$1"; shift +X2GO_KBD_TYPE="$1"; shift +X2GO_SET_KBD="$1"; shift +X2GO_STYPE="$1"; shift +X2GO_CMD="$1"; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 @@ -60,7 +60,7 @@ if [ "$X2GO_STYPE" == "S" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "shadow session requested: mode $SHADOW_MODE, user: $SHADOW_USER, desktop: $SHADOW_DESKTOP" } || { - SHADREQ_USER=$1; shift + SHADREQ_USER="$1"; shift $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "preparing shadow session request for user $SHADREQ_USER, agent starts for user ${USER}" } @@ -78,8 +78,8 @@ if [ "$X2GO_STYPE" == "S" ]; then X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` X2GO_PORT=`echo $OUTPUT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" - xauth -f $XAUTHORITY add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} - xauth -f $XAUTHORITY add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} + xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" + xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" echo $X2GO_PORT echo $X2GO_COOKIE @@ -100,7 +100,7 @@ if [ "$LWORD" == "LIMIT" ]; then exit -1 fi -export NX_CLIENT=$X2GO_LIB_PATH/x2gosuspend-agent +export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` @@ -113,7 +113,7 @@ elif [ "$X2GO_STYPE" == "S" ]; then fi if [ "$X2GO_CLIENT" == "" ]; then - X2GO_CLIENT=$HOSTNAME + X2GO_CLIENT="$HOSTNAME" fi USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` @@ -133,9 +133,9 @@ while [ "$OUTPUT" != "inserted" ]; do grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then OUTPUT="XXX" else - SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"` + SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" if [ "$COLORDEPTH" != "" ]; then - SESSION_NAME="$SESSION_NAME"_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH} + SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` fi OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession $X2GO_PORT $HOSTNAME $SESSION_NAME` @@ -158,11 +158,11 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d fi done if [ "$GR_PORT" == "" ]; then - GR_PORT=$SSH_PORT + GR_PORT="$SSH_PORT" elif [ "$SOUND_PORT" == "" ]; then - SOUND_PORT=$SSH_PORT + SOUND_PORT="$SSH_PORT" else - FS_PORT=$SSH_PORT + FS_PORT="$SSH_PORT" fi done @@ -182,18 +182,18 @@ if [ "$X2GO_STYPE" == "S" ]; then X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/-geometry//"` fi -SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME} +SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" -if [ ! -d $X2GO_ROOT ]; then - mkdir $X2GO_ROOT +if [ ! -d "$X2GO_ROOT" ]; then + mkdir "$X2GO_ROOT" fi -if [ ! -d $X2GO_ROOT/ssh ]; then - mkdir $X2GO_ROOT/ssh +if [ ! -d "$X2GO_ROOT/ssh" ]; then + mkdir "$X2GO_ROOT/ssh" fi -if [ ! -d $SESSION_DIR ]; then - mkdir $SESSION_DIR +if [ ! -d "$SESSION_DIR" ]; then + mkdir "$SESSION_DIR" fi X2GO_COOKIE=`mcookie` @@ -204,8 +204,8 @@ PATH="${PATH}:${X2GO_BIN}/" export PATH -xauth -f $XAUTHORITY add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} -xauth -f $XAUTHORITY add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} +xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" +xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" if [ "$X2GO_SET_KBD" == "0" ] @@ -216,7 +216,7 @@ else fi -echo "${X2GO_HOST}:${X2GO_PORT}" >${SESSION_DIR}/options +echo "${X2GO_HOST}:${X2GO_PORT}" >"${SESSION_DIR}/options" NX_AGENT=":${X2GO_PORT}" SAVED_DISPLAY="$DISPLAY" @@ -237,14 +237,14 @@ else fi # run x2goserver-extensions for pre-start -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-start || true SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth $XAUTHORITY -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth $XAUTHORITY -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ "$XDMCPOPT" -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & fi @@ -254,19 +254,19 @@ test $X2GO_AGENT_RETVAL && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2Go agent session with ID $SESSION_NAME" # run x2goserver-extensions for post-start - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-start || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-start || true } || { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2Go agent session with ID $SESSION_NAME" # run x2goserver-extensions for fail-start - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-start || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-start || true } X2GO_SND_PORT=1024 -$X2GO_LIB_PATH/x2gocreatesession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $FS_PORT $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null echo $X2GO_PORT echo $X2GO_COOKIE diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index b9eeb7f..1311d40 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -21,9 +21,9 @@ # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> if [ $# -eq 1 ]; then - SESSION_NAME=$1 + SESSION_NAME="$1" else - SESSION_NAME=$X2GO_SESSION + SESSION_NAME="$X2GO_SESSION" fi X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` @@ -36,19 +36,19 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` # workaround for knotify, keep silent in case no knotify is running killall -HUP knotify &>/dev/null -$X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2gochangestatus 'S' "$SESSION_NAME" > /dev/null # terminate x2godesktopsharing instance and remember that it was running... -x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing $SESSION_NAME || true +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing "$SESSION_NAME" || true # run x2goserver-extensions for pre-suspend -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-suspend || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-suspend || true kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been suspended successfully" # run x2goserver-extensions for post-suspend - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-suspend || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-suspend || true } || { err_msg="ERROR: failed to suspend session with ID $SESSION_NAME" @@ -57,13 +57,13 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { # If we reach here it means that the x2goagent process of the session has vanisshed # If this happens than we mark the session as finished... - $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null + $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-suspend - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-suspend || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-suspend || true } -export HOSTNAME -x2goumount-session $SESSION_NAME +export HOSTNAME +x2goumount-session "$SESSION_NAME" diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 10df64a..59e0944 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -21,9 +21,9 @@ # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> if [ $# -eq 1 ]; then - SESSION_NAME=$1 + SESSION_NAME="$1" else - SESSION_NAME=$X2GO_SESSION + SESSION_NAME="$X2GO_SESSION" fi X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` @@ -33,19 +33,19 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` -$X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing $SESSION_NAME || true +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SESSION_NAME" || true # run x2goserver-extensions for pre-terminate -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-terminate || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-terminate || true kill -TERM $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully" + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID "$SESSION_NAME" has been terminated successfully" # run x2goserver-extensions for post-terminate - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-terminate || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-terminate || true } || { err_msg="ERROR: failed to terminate session with ID $SESSION_NAME" @@ -56,14 +56,14 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" # run x2goserver-extensions for fail-terminate - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-terminate || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-terminate || true } export HOSTNAME -x2goumount-session $SESSION_NAME +x2goumount-session "$SESSION_NAME" # if we are not running in log level debug (=7) then clean up session dir if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then - (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)& + (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& fi diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index 3720bf0..fefda30 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -40,7 +40,7 @@ if [ -n "$1" ]; then echo "Version information for X2Go component '$X2GO_COMPONENT' is not available." >&1 fi else - cd ${X2GO_VERSIONS_BASEPATH} + cd "${X2GO_VERSIONS_BASEPATH}" for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)" X2GO_COMPONENT_VERSION="$(get_version $compfile)" 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.1.0.10-75-g84074f1
by git-admin＠x2go.org 20 Feb '12

20 Feb '12

The branch, master has been updated via 84074f170c26a8d2431571dfbbc64a7aa3464236 (commit) from 00250a11898323c98b3dddf97e0e08008532d903 (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 84074f170c26a8d2431571dfbbc64a7aa3464236 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 20:39:09 2012 +0100 Handle the situation that no printer is installed with CUPS/WinSpool gracefully. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- pyhoca/wxgui/printingprefs.py | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 21904ec..6fe11a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,7 +41,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Provide empty translation file nb_NO.po. - Fix profile manager GUI layout, make default keyboard layout i18n capable. - - Handle the situation that no printers are installed with CUPS/WinSpool. + - Handle the situation that no printer is installed with CUPS/WinSpool + gracefully. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 6089087..2c94ae2 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -219,15 +219,16 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): self.PdfViewCmd.SetValue(self.client_printing.get_property('pdfview_cmd')) self.PdfSaveToFolder.SetValue(self.client_printing.get_property('save_to_folder')) if self._defaultPrinter != '#PRINTSYSTEM_UNAVAILABLE#': - try: - _printer_name = self._availablePrinters[self.client_printing.get_property('printer')] - except KeyError: - _printer_name = self._availablePrinters[self._defaultPrinter] - elif self._defaultPrinter == None: - _printer_name = _(u'- no printers installed -') - self.PrintPrinter.Clear() - self.PrintPrinter.Append(_(_printer_name)) - self.PrintPrinter.Enable(False) + if self._defaultPrinter != None: + try: + _printer_name = self._availablePrinters[self.client_printing.get_property('printer')] + except KeyError: + _printer_name = self._availablePrinters[self._defaultPrinter] + else: + _printer_name = _(u'- no printers installed -') + self.PrintPrinter.Clear() + self.PrintPrinter.Append(_(_printer_name)) + self.PrintPrinter.Enable(False) else: _printer_name = _(u'- print system is not available -') self.PrintPrinter.Clear() 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

x2goserver.git - master (branch) updated: 3.0.99.10-22-g9da2c4d
by git-admin＠x2go.org 20 Feb '12

20 Feb '12

The branch, master has been updated via 9da2c4d6265d79db87121bb529901759f3c2af4f (commit) via db9fa7f16780b11876c1b66399be76929feaea03 (commit) from 0253416b5e4b2e90b0a142b9219c3e808def41d8 (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 9da2c4d6265d79db87121bb529901759f3c2af4f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 20:31:07 2012 +0100 typo fix commit db9fa7f16780b11876c1b66399be76929feaea03 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 10:16:49 2012 +0100 Let x2goserver package suggest x2goserver-fmbindings. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 1 + x2goserver/bin/x2goumount-session | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ef996c8..24be3ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority). - For x2gomountdirs / x2goumount-session allow other TMP paths than /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. + * Let x2goserver package suggest x2goserver-fmbindings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/debian/control b/debian/control index 8ca849c..ae422e5 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Suggests: x2goserver-printing (= ${source:Version}), x2goserver-compat (= ${source:Version}), x2goserver-xsession (= ${source:Version}), + x2goserver-fmbindings (= ${source:Version}), x2goserver-pyhoca (= ${source:Version}) Breaks: x2goserver-one, diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 3cf856c..88bc7fc 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -34,7 +34,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2goumount-session has been called with options: @ARGV"); -my $tmp_dir = $ENV{'TMP'} || '/tmp' +my $tmp_dir = $ENV{'TMP'} || '/tmp'; my $session=shift; my $only_path=shift; 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.1.0.10-74-g00250a1
by git-admin＠x2go.org 20 Feb '12

20 Feb '12

The branch, master has been updated via 00250a11898323c98b3dddf97e0e08008532d903 (commit) from 5bd4fd3c76cefed7183e1a4cc597ceb7811764ef (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 00250a11898323c98b3dddf97e0e08008532d903 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 19:27:50 2012 +0100 Update Swedish translation. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + po/sv.po | 155 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 88 insertions(+), 68 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6a95634..21904ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.2.0): - Add Swedish translation file. - Fine-tune Swedish translation. + - Update Swedish translation. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 diff --git a/po/sv.po b/po/sv.po index bf0d065..a3c04c6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-02-20 10:40+0100\n" -"PO-Revision-Date: 2012-02-19 11:01+0100\n" +"PO-Revision-Date: 2012-02-20 18:49+0100\n" "Last-Translator: Daniel Lindgren <bd.dali(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" "Language: sv\n" @@ -26,11 +26,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Användarnamn" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 +#: ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Lösenord" @@ -50,23 +52,28 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:296 -#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 +#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/messages.py:111 +#: ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:310 #: ../pyhoca/wxgui/frontend.py:366 #, python-format msgid "%s - connect failure" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:366 msgid "User is not allowed to start X2Go sessions!" msgstr "Användaren har inte rätt att starta X2Go-sessioner!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:283 +#: ../pyhoca/wxgui/frontend.py:373 #, python-format msgid "%s - connect" msgstr "%s - anslut" @@ -92,31 +99,38 @@ msgstr "%s - SSH-proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentisering till SSH-proxy misslyckades!" -#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:379 ../pyhoca/wxgui/logon.py:387 -#: ../pyhoca/wxgui/frontend.py:392 ../pyhoca/wxgui/frontend.py:413 -#: ../pyhoca/wxgui/frontend.py:420 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:379 +#: ../pyhoca/wxgui/logon.py:387 +#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:427 #, python-format msgid "%s - connect error" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:399 +#: ../pyhoca/wxgui/logon.py:347 +#: ../pyhoca/wxgui/frontend.py:399 #: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - host key error" msgstr "%s - fel på serverns nyckel" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:399 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:348 +#: ../pyhoca/wxgui/frontend.py:399 +msgid "The remote server's host key is invalid or has not been accepted by the user" msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:441 +#: ../pyhoca/wxgui/logon.py:355 +#: ../pyhoca/wxgui/frontend.py:441 #, python-format msgid "%s - missing home directory" msgstr "%s - hemkatalog saknas" -#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:441 +#: ../pyhoca/wxgui/logon.py:356 +#: ../pyhoca/wxgui/frontend.py:441 msgid "The remote user's home directory does not exist." msgstr "Fjärranvändarens hemkatalog saknas." @@ -125,7 +139,8 @@ msgstr "Fjärranvändarens hemkatalog saknas." msgid "%s - key error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/frontend.py:448 +#: ../pyhoca/wxgui/logon.py:371 +#: ../pyhoca/wxgui/frontend.py:448 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringsfel" @@ -206,23 +221,28 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:189 +#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Custom command" msgstr "Anpassat kommando" -#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:298 +#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/menus_taskbar.py:298 msgid "Internet Browser" msgstr "Webbbläsare" -#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:299 +#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/menus_taskbar.py:299 msgid "Email Client" msgstr "E-postklient" -#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:300 +#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/menus_taskbar.py:300 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:301 +#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/menus_taskbar.py:301 msgid "Terminal" msgstr "Terminal" @@ -245,11 +265,11 @@ msgstr "inställningar hämtade från" #. allow localization of the default keyboard settings #: ../pyhoca/wxgui/profilemanager.py:134 msgid "us" -msgstr "" +msgstr "se" #: ../pyhoca/wxgui/profilemanager.py:135 msgid "pc105/us" -msgstr "" +msgstr "pc105/se" #: ../pyhoca/wxgui/profilemanager.py:136 msgid "new session profile" @@ -353,7 +373,8 @@ msgstr "RDP-alternativ" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "User" msgstr "Användare" @@ -478,7 +499,8 @@ msgstr "Använd lokal mappdelning" msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:271 ../pyhoca/wxgui/profilemanager.py:290 +#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Add" msgstr "Lägg till" @@ -530,12 +552,14 @@ msgstr "Spara" msgid "Reset" msgstr "Återställ" -#: ../pyhoca/wxgui/profilemanager.py:337 ../pyhoca/wxgui/profilemanager.py:978 +#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:978 #: ../pyhoca/wxgui/profilemanager.py:1485 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:339 ../pyhoca/wxgui/profilemanager.py:980 +#: ../pyhoca/wxgui/profilemanager.py:339 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "manually" msgstr "manuellt" @@ -598,7 +622,8 @@ msgstr "Välj en mapp att dela i en session" #: ../pyhoca/wxgui/profilemanager.py:1532 #: ../pyhoca/wxgui/profilemanager.py:1535 #: ../pyhoca/wxgui/profilemanager.py:1540 -#: ../pyhoca/wxgui/profilemanager.py:1550 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1550 +#: ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "Profilhanterare" @@ -619,12 +644,10 @@ msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." #: ../pyhoca/wxgui/profilemanager.py:1550 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-" -"proxy.\n" +"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-proxy.\n" "Ändra konfiguration för SSH-proxy ." #: ../pyhoca/wxgui/profilemanager.py:1570 @@ -670,7 +693,8 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:121 ../pyhoca/wxgui/menus_taskbar.py:570 +#: ../pyhoca/wxgui/menus_taskbar.py:121 +#: ../pyhoca/wxgui/menus_taskbar.py:570 msgid "E&xit" msgstr "&Avsluta" @@ -778,7 +802,8 @@ msgstr "Starta/återanslut session" msgid "Connect Server" msgstr "Anslut till server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Om %s ..." @@ -788,10 +813,8 @@ msgid "Public SSH key authentication has been successful." msgstr "Autentisering med publik SSH-nyckel lyckades." #: ../pyhoca/wxgui/frontend.py:406 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" #: ../pyhoca/wxgui/frontend.py:427 msgid "Authentication protocol communication incomplete! Try again..." @@ -867,14 +890,13 @@ msgstr "%s - kanalfel" #: ../pyhoca/wxgui/frontend.py:778 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Anslutning till %s avslutades oväntat! Försök återansluta till server..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:788 ../pyhoca/wxgui/frontend.py:795 -#: ../pyhoca/wxgui/frontend.py:797 ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:788 +#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:809 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" @@ -904,20 +926,13 @@ msgstr "%s - sessionsvarning" #: ../pyhoca/wxgui/frontend.py:803 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Omvänd TCP port forwarding för session %s till serverport %s har nekats." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Omvänd TCP port forwarding för session %s till serverport %s har nekats." #: ../pyhoca/wxgui/frontend.py:809 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " -"Sessionsstart misslyckades." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. Sessionsstart misslyckades." #: ../pyhoca/wxgui/frontend.py:821 #, python-format @@ -925,11 +940,11 @@ msgid "%s - audio warning" msgstr "%s - ljudvarning" #: ../pyhoca/wxgui/frontend.py:821 -msgid "" -"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner." -#: ../pyhoca/wxgui/frontend.py:824 ../pyhoca/wxgui/frontend.py:827 +#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" @@ -956,7 +971,8 @@ msgstr "" "Anslutning för ljud kunde ej genomföras för denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:846 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" @@ -983,7 +999,8 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:854 #, python-format msgid "%s - start" msgstr "%s - startar" @@ -1006,7 +1023,8 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "%s - resume" msgstr "%s - återanslut" @@ -1102,7 +1120,8 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "OK" @@ -1177,13 +1196,12 @@ msgid "Print" msgstr "Skriv ut" #: ../pyhoca/wxgui/printingprefs.py:227 -#, fuzzy msgid "- no printers installed -" msgstr "- utskrifter ej tillgängliga -" #: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" -msgstr "- utskrifter ej tillgängliga -" +msgstr "- utskriftssystem ej tillgängligt -" #: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" @@ -1205,3 +1223,4 @@ msgstr "Ändra sessionstitel till" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" msgstr "OK" + 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-73-g5bd4fd3
by git-admin＠x2go.org 20 Feb '12

20 Feb '12

The branch, master has been updated via 5bd4fd3c76cefed7183e1a4cc597ceb7811764ef (commit) via 76d638f6abfb6b501d384c411bd858ffbf480c36 (commit) from 4f77721cc61f95bca156e6b548c2a2e9ebb1c693 (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 5bd4fd3c76cefed7183e1a4cc597ceb7811764ef Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 10:41:28 2012 +0100 rebuild i18n binaries, remove one fuzzy tag from de.po commit 76d638f6abfb6b501d384c411bd858ffbf480c36 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 10:40:04 2012 +0100 Fine-tune Bokmal (Norway translation file. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/pyhoca-gui.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 19174 -> 19254 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 17976 -> 18044 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 17906 -> 17906 bytes build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo | Bin 15207 -> 18486 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 17240 -> 17240 bytes build/mo/sv/LC_MESSAGES/pyhoca-gui.mo | Bin 17940 -> 17940 bytes debian/changelog | 1 + po/bg.po | 2 +- po/de.po | 3 +- po/en.po | 2 +- po/es.po | 2 +- po/nb_NO.po | 85 +++++++++++------------------ po/nl.po | 2 +- po/pyhoca-gui.pot | 2 +- po/sv.po | 2 +- 16 files changed, 40 insertions(+), 61 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 e68f094..b699c52 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/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index 9adca8f..aa54b85 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 b808f4d..faa49a5 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 7f0f9d9..c0fa1fd 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/nb_NO/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo index 4fc259d..f40f420 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 d3a3b1f..63ad1f1 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/sv/LC_MESSAGES/pyhoca-gui.mo b/build/mo/sv/LC_MESSAGES/pyhoca-gui.mo index 33620f7..d0851b4 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/debian/changelog b/debian/changelog index 69fafc6..6a95634 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low [ Terje Andersen ] * New upstream version (0.1.2.0): - Add Bokmal (Norway) translation file (not complete, yet). + - Fine-tune Bokmal (Norway translation file. [ Daniel Lindgren ] * New upstream version (0.1.2.0): diff --git a/po/bg.po b/po/bg.po index 7b801f0..ee89831 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-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+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" diff --git a/po/de.po b/po/de.po index 64bebe3..cde63b4 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-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+0100\n" "PO-Revision-Date: 2012-02-07 23:29+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" @@ -1187,7 +1187,6 @@ msgid "Print" msgstr "Drucken" #: ../pyhoca/wxgui/printingprefs.py:227 -#, fuzzy msgid "- no printers installed -" msgstr "- es sind keine Drucker installiert -" diff --git a/po/en.po b/po/en.po index 1479ebc..a347e59 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-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+0100\n" "PO-Revision-Date: 2012-02-07 23:28+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/es.po b/po/es.po index 8b6dcf0..d7d4a84 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+0100\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index 47b4bd9..667659e 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-19 20:23+0100\n" -"PO-Revision-Date: 2012-02-19 14:26+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"PO-Revision-Date: 2012-02-19 23:16+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" "Language: nb_NO\n" @@ -62,7 +62,6 @@ msgid "%s - connect failure" msgstr "%s - tilkoblingsfeil" #: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:366 -#, fuzzy msgid "User is not allowed to start X2Go sessions!" msgstr "Bruker kontoen har ikke tillatelse til å starte X2Go sesjoner!" @@ -146,7 +145,7 @@ msgstr "" "Kobler deg til ,,%s''" #: ../pyhoca/wxgui/taskbar.py:82 -#, fuzzy, python-format +#, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" "Currently connecting you to remote X2Go server ,,%s''" @@ -155,7 +154,6 @@ msgstr "" "Holder på med å koble deg til X2Go serveren ,,%s''" #: ../pyhoca/wxgui/taskbar.py:87 -#, fuzzy msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." @@ -164,7 +162,6 @@ msgstr "" "Kobler deg til X2Go..." #: ../pyhoca/wxgui/taskbar.py:90 -#, fuzzy msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -223,9 +220,8 @@ msgid "Email Client" msgstr "Epost klient" #: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:300 -#, fuzzy msgid "Office" -msgstr "Openoffice.org" +msgstr "Kontor" #: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:301 msgid "Terminal" @@ -245,16 +241,16 @@ msgstr "Lagre innkommende fil som ..." #: ../pyhoca/wxgui/profilemanager.py:129 msgid "settings derived from " -msgstr "" +msgstr "innstillinger arvet fra" #. allow localization of the default keyboard settings #: ../pyhoca/wxgui/profilemanager.py:134 msgid "us" -msgstr "" +msgstr "no" #: ../pyhoca/wxgui/profilemanager.py:135 msgid "pc105/us" -msgstr "" +msgstr "pc105/no" #: ../pyhoca/wxgui/profilemanager.py:136 msgid "new session profile" @@ -262,19 +258,16 @@ msgstr "ny sesjonsprofil" #. boxes for all tabs #: ../pyhoca/wxgui/profilemanager.py:149 -#, fuzzy msgid "Session Title" -msgstr "Sesjonsprofil" +msgstr "Sesjonstittel" #: ../pyhoca/wxgui/profilemanager.py:150 -#, fuzzy msgid "Session Window" -msgstr "Sesjons innlogging" +msgstr "Sesjonsvindu" #: ../pyhoca/wxgui/profilemanager.py:151 -#, fuzzy msgid "Session Startup" -msgstr "Sesjon" +msgstr "Sesjon oppstart" #: ../pyhoca/wxgui/profilemanager.py:152 msgid "Server" @@ -320,22 +313,20 @@ msgid "Name" msgstr "Navn" #: ../pyhoca/wxgui/profilemanager.py:167 -#, fuzzy msgid "Set session window title" -msgstr "ny sesjonsprofil" +msgstr "Angi sesjons vindustittel" #: ../pyhoca/wxgui/profilemanager.py:168 -#, fuzzy msgid "Use a default session window title" -msgstr "Benytt standard lydport" +msgstr "Benytt standard sesjons vindustittel" #: ../pyhoca/wxgui/profilemanager.py:169 msgid "Custom session window title" -msgstr "" +msgstr "Tilpasset sesjon vindustittel" #: ../pyhoca/wxgui/profilemanager.py:179 msgid "Window Icon" -msgstr "" +msgstr "Vindusikon" #. ## #. ## widgets for the SESSION tab @@ -564,7 +555,6 @@ msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profil håndterer - %s" #: ../pyhoca/wxgui/profilemanager.py:705 -#, fuzzy msgid "Profile" msgstr "Profil" @@ -662,7 +652,7 @@ msgstr "Rediger profil" #: ../pyhoca/wxgui/menus_taskbar.py:60 msgid "Use as Template for New Profile" -msgstr "" +msgstr "Benytt som mal for en ny profil" #: ../pyhoca/wxgui/menus_taskbar.py:61 msgid "Delete Profile" @@ -687,7 +677,7 @@ msgstr "&Avslutt" #: ../pyhoca/wxgui/menus_taskbar.py:169 msgid "Window title" -msgstr "" +msgstr "Vindustittel" #: ../pyhoca/wxgui/menus_taskbar.py:175 msgid "Resume Session" @@ -714,14 +704,12 @@ msgid "Terminate Session" msgstr "Avslutte sesjon" #: ../pyhoca/wxgui/menus_taskbar.py:198 -#, fuzzy msgid "Rename Session Window" -msgstr "Gjenoppta sesjon" +msgstr "Omdøp sesjonsvinduet" #: ../pyhoca/wxgui/menus_taskbar.py:199 -#, fuzzy msgid "Show Session Window" -msgstr "Sesjons innlogging" +msgstr "Vis sesjonsvindu" #: ../pyhoca/wxgui/menus_taskbar.py:231 msgid "&Share custom local folder" @@ -740,7 +728,6 @@ msgid "Unshare &all local folders" msgstr "Stopp deling på a&lle lokale mapper" #: ../pyhoca/wxgui/menus_taskbar.py:348 -#, fuzzy msgid "Start &new Desktop Session" msgstr "Start &ny sesjon" @@ -749,9 +736,8 @@ msgid "Start &new Session" msgstr "Start &ny sesjon" #: ../pyhoca/wxgui/menus_taskbar.py:355 -#, fuzzy msgid "Launch Single Application" -msgstr "Enkelt applikasjon" +msgstr "Start enkelt applikasjon" #: ../pyhoca/wxgui/menus_taskbar.py:373 msgid "Running" @@ -824,7 +810,6 @@ msgid "An unknown error occurred during authentication!" msgstr "En ukjent feil oppstod under autentiseringen! " #: ../pyhoca/wxgui/frontend.py:570 -#, fuzzy msgid "Cleaning X2Go sessions..." msgstr "Rensker opp i X2Go sesjoner..." @@ -834,7 +819,6 @@ msgid "%s - disconnect" msgstr "%s - koble fra" #: ../pyhoca/wxgui/frontend.py:589 -#, fuzzy msgid "X2Go Profile is now disconnected." msgstr "X2Go profilen er nå frakoblet." @@ -904,12 +888,12 @@ msgid "The session startup failed." msgstr "Oppstart av sesjonen feilet." #: ../pyhoca/wxgui/frontend.py:795 -#, fuzzy, python-format +#, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandoen \"%s\" er ikke tilgjengelig på X2Go serveren." #: ../pyhoca/wxgui/frontend.py:797 -#, fuzzy, python-format +#, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." @@ -946,7 +930,6 @@ msgid "%s - audio warning" msgstr "%s - advarsel om lyd" #: ../pyhoca/wxgui/frontend.py:821 -#, fuzzy msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" @@ -959,12 +942,10 @@ msgid "%s - audio error" msgstr "%s - feil med lyden" #: ../pyhoca/wxgui/frontend.py:824 -#, fuzzy msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio systemet kan ikke bli startet." #: ../pyhoca/wxgui/frontend.py:827 -#, fuzzy msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio systemet har uventet stoppet." @@ -1015,7 +996,7 @@ msgid "%s - start" msgstr "%s - start" #: ../pyhoca/wxgui/frontend.py:850 -#, fuzzy, python-format +#, python-format msgid "" "New X2Go session starting up...\n" "%s" @@ -1024,7 +1005,7 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:854 -#, fuzzy, python-format +#, python-format msgid "" "Another client started X2Go session\n" "%s" @@ -1038,7 +1019,7 @@ msgid "%s - resume" msgstr "%s - gjenoppta" #: ../pyhoca/wxgui/frontend.py:858 -#, fuzzy, python-format +#, python-format msgid "" "Resuming X2Go session...\n" "%s" @@ -1047,7 +1028,7 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:862 -#, fuzzy, python-format +#, python-format msgid "" "Another client resumed X2Go session\n" "%s" @@ -1075,7 +1056,7 @@ msgid "%s - suspend" msgstr "%s - koble fra" #: ../pyhoca/wxgui/frontend.py:870 -#, fuzzy, python-format +#, python-format msgid "" "X2Go Session has been suspended\n" "%s" @@ -1089,7 +1070,7 @@ msgid "%s - terminate" msgstr "%s - avslutt" #: ../pyhoca/wxgui/frontend.py:886 -#, fuzzy, python-format +#, python-format msgid "" "X2Go Session has terminated\n" "%s" @@ -1204,9 +1185,8 @@ msgid "Print" msgstr "Skriv ut" #: ../pyhoca/wxgui/printingprefs.py:227 -#, fuzzy msgid "- no printers installed -" -msgstr "- utskriftssystemet er ikke tilgjengelig -" +msgstr "- ingen skrivere installert -" #: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" @@ -1221,18 +1201,17 @@ msgid "Choose PDF saving location" msgstr "Velg plassering for PDF lagring" #: ../pyhoca/wxgui/sessiontitle.py:69 -#, fuzzy, python-format +#, python-format msgid "Session Title - %s" -msgstr "Sesjonsprofil" +msgstr "Sesjonstittel - %s" #: ../pyhoca/wxgui/sessiontitle.py:71 -#, fuzzy msgid "Change session title to" -msgstr "ny sesjonsprofil" +msgstr "Endre sesjonstittelen til" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" -msgstr "" +msgstr "OK" #~ msgid "Icon" #~ msgstr "Ikon" diff --git a/po/nl.po b/po/nl.po index abe5768..75c546c 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-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+0100\n" "PO-Revision-Date: 2012-02-07 23:31+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 6738911..a72b7e0 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-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+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" diff --git a/po/sv.po b/po/sv.po index 534cc2b..bf0d065 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-02-19 20:23+0100\n" +"POT-Creation-Date: 2012-02-20 10:40+0100\n" "PO-Revision-Date: 2012-02-19 11:01+0100\n" "Last-Translator: Daniel Lindgren <bd.dali(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" 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

x2goclient.git - master (branch) updated: 3.99.0.6-31-g2220856
by git-admin＠x2go.org 20 Feb '12

20 Feb '12

The branch, master has been updated via 2220856b8ecf31845ad87ada52a6b15a814d80d6 (commit) via b1010d564d2f52681513cb10006f9f217e2aa022 (commit) from 1026290ddc0e678bb392fefdbb4932d355a8f103 (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 2220856b8ecf31845ad87ada52a6b15a814d80d6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 10:20:52 2012 +0100 Fix misspelled word ,,recieved'' -> ,,received''. commit b1010d564d2f52681513cb10006f9f217e2aa022 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 10:20:00 2012 +0100 Fix misspelled word ,,Authentification'' -> ,,Authentication''. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ httpbrokerclient.cpp | 2 +- onmainwindow_part2.cpp | 2 +- x2goclient_de.ts | 2 +- x2goclient_en.ts | 2 +- x2goclient_fr.ts | 2 +- x2goclient_nb_no.ts | 2 +- x2goclient_ru.ts | 2 +- x2goclient_sv.ts | 2 +- x2goclient_zh_tw.ts | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 04b8a89..9483384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low - Update all translation files (lupdate), translate unfinished translation tags in x2goclient_de.ts. - Provide empty translation file x2goclient_en.ts. + - Fix misspelled word ,,Authentification'' -> ,,Authentication''. + - Fix misspelled word ,,recieved'' -> ,,received''. [ Mihai Moldovan ] * New upstream version (3.99.1.0): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index ed05fd8..8402e0c 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -314,7 +314,7 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) { //x2goDebug<<"cmd request answer: "<<answer; - x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"recieved:"<<httpSessionAnswer.size()<<endl; + x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"received:"<<httpSessionAnswer.size()<<endl; emit connectionTime(requestTime.elapsed(),httpSessionAnswer.size()); return; } diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index d228cb9..7d1a206 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -143,7 +143,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) sshConnection=0l; } - QMessageBox::critical ( 0l,tr ( "Authentification failed" ),error, + QMessageBox::critical ( 0l,tr ( "Authentication failed" ),error, QMessageBox::Ok, QMessageBox::NoButton ); // currentKey=QString::null; diff --git a/x2goclient_de.ts b/x2goclient_de.ts index b478a48..09baf25 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1829,7 +1829,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation>Anmeldung fehlgeschlagen</translation> </message> <message> diff --git a/x2goclient_en.ts b/x2goclient_en.ts index 49707c6..ff3ab11 100644 --- a/x2goclient_en.ts +++ b/x2goclient_en.ts @@ -1051,7 +1051,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 37b21c4..02cf546 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1162,7 +1162,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index f5a1150..f541e95 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1479,7 +1479,7 @@ Offentlig nøkkel: </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation>Pålogging feilet</translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index f23efae..3bc79f4 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1432,7 +1432,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index e2efca0..94fcf10 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -1062,7 +1062,7 @@ Publik nyckel: </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation>Autentisering misslyckades</translation> </message> <message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index e0a4dca..142418c 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -1055,7 +1055,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part2.cpp" line="146"/> - <source>Authentification failed</source> + <source>Authentication failed</source> <translation>認證失敗</translation> </message> <message> hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-33-gfde6a88
by git-admin＠x2go.org 20 Feb '12

20 Feb '12

The branch, master has been updated via fde6a88a81ebdeb151a39e05977279d060f16884 (commit) from ec47c22c264bd2f1d2ce6e434b503a701dc129f7 (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 fde6a88a81ebdeb151a39e05977279d060f16884 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 20 10:00:00 2012 +0100 Fine-tune symlinking of libXinerama. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/libnx-x11.install | 1 - debian/libnx-x11.links | 4 ++-- debian/post-build-nx.sh | 3 --- debian/rules | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1e007bb..185f8e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low * Fix Xinerama support in Debian package libnx-x11 when NX gets built with patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Still on the todo list: fix the nx-X11 installation via Makefile. + * Fine-tune symlinking of libXinerama. [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index f2cf59e..7838d08 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,3 +1,2 @@ nx-X11/.build-exports/lib/* usr/lib/nx/X11 -nx-X11/lib/Xinerama/libNX_Xinerama.so* usr/lib/nx/X11/Xinerama nx-X11/programs/Xserver/Xext/SecurityPolicy usr/share/nx diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links index 67a1d24..82c245f 100644 --- a/debian/libnx-x11.links +++ b/debian/libnx-x11.links @@ -1,4 +1,4 @@ usr/lib/libX11.so.6 usr/lib/nx/X11/Xinerama/libNX_X11.so.6 usr/lib/libXext.so.6 usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 -usr/lib/nx/X11/Xinerama/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so -usr/lib/nx/X11/Xinerama/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1 +usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so +usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1 diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh index 4ca2128..2d1f8d2 100755 --- a/debian/post-build-nx.sh +++ b/debian/post-build-nx.sh @@ -24,7 +24,4 @@ find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do done -# do not install libXinerama into default path... -rm -f nx-X11/.build-exports/lib/libXinerama* - exit 0 diff --git a/debian/rules b/debian/rules index 4a4782d..a5ac09e 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ else endif %: - LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:`pwd`/debian/libnx-x11/usr/lib/nx/X11/Xinerama:$$LD_LIBRARY_PATH dh $@ --with quilt + LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - master (branch) updated: 3.0.99.10-20-g0253416
by git-admin＠x2go.org 19 Feb '12

19 Feb '12

The branch, master has been updated via 0253416b5e4b2e90b0a142b9219c3e808def41d8 (commit) from 4f8e5f05cf758b6b7d98cc563da553b05b443cd2 (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 0253416b5e4b2e90b0a142b9219c3e808def41d8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 19 22:53:56 2012 +0100 For x2gomountdirs / x2goumount-session allow other TMP paths than /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gomountdirs | 8 +++++--- x2goserver/bin/x2goumount-session | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 22466d4..ef996c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low provided by Milan Knížek (Thanks!). - Do not create desktop icons for rootless (i.e. non-desktop) sessions. - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority). + - For x2gomountdirs / x2goumount-session allow other TMP paths than + /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 0b77039..58f3590 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -33,6 +33,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); +my $tmp_dir = $ENV{'TMP'} || '/tmp'; + my $type=shift; my $session=shift; my $user=shift; @@ -98,12 +100,12 @@ close(F); chmod(0600,"$key"); chmod(0600,"$key.ident"); -my $mdir="/tmp/$ENV{'USER'}_media"; +my $mdir="$tmp_dir/$ENV{'USER'}_media"; my $ldir="$ENV{'HOME'}/media"; my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; -my $spooldir="/tmp/spool_$ENV{'USER'}"; +my $spooldir="$tmp_dir/spool_$ENV{'USER'}"; my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox"; -my $mimeboxdir="/tmp/mimebox_$ENV{'USER'}"; +my $mimeboxdir="$tmp_dir/mimebox_$ENV{'USER'}"; if (! -e $mdir) { diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index d9fcdfe..3cf856c 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -34,6 +34,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2goumount-session has been called with options: @ARGV"); +my $tmp_dir = $ENV{'TMP'} || '/tmp' + my $session=shift; my $only_path=shift; my $uname=$ENV{'USER'}; @@ -46,7 +48,7 @@ if ($only_path) ### FIXME: handle CDROM and Removable Media mounts here, as well!!! - $only_path="/tmp/$ENV{'USER'}_media/disk/$only_path"; + $only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path"; # ^^^^ syslog('debug',"x2goumount-session unmounting $only_path only"); } 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits