x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-277-gcea2b3c
by git-admin＠x2go.org 22 Sep '11

22 Sep '11

The branch, master has been updated via cea2b3cb96b8a0ab8ca52d8b1751c481b64e75f5 (commit) from c12be797c5798f68a73ce3581fb6b46a4912b03a (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 cea2b3cb96b8a0ab8ca52d8b1751c481b64e75f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 18:22:16 2011 +0200 Add return value information of X2go commands to man pages. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-extensions/man/man8/x2gosetkeyboard.8 | 5 ++++ x2goserver-extensions/man/man8/x2goversion.8 | 3 ++ x2goserver/bin/x2goresume-session | 6 ++-- x2goserver/man/man8/x2gocmdexitmessage.8 | 4 +++ x2goserver/man/man8/x2golistdesktops.8 | 3 ++ x2goserver/man/man8/x2golistsessions.8 | 26 +++++++++++++++++++++- x2goserver/man/man8/x2golistsessions_root.8 | 4 +++ x2goserver/man/man8/x2gomountdirs.8 | 19 ++++++++++++++++ x2goserver/man/man8/x2goprint.8 | 6 +++++ x2goserver/man/man8/x2goresume-session.8 | 4 +++ x2goserver/man/man8/x2goruncommand.8 | 3 ++ x2goserver/man/man8/x2gostartagent.8 | 4 +- x2goserver/man/man8/x2gosuspend-session.8 | 3 ++ x2goserver/man/man8/x2goterminate-session.8 | 3 ++ x2goserver/man/man8/x2goumount-session.8 | 9 ++++++- 16 files changed, 95 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b19fae7..1a13e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low ToDo: folder type CDROM and removable media. * Let db_insertmount create a proper return value (success vs. failed). * Improvement of man pages. + * Add return value information of X2go commands to man pages. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 index 702155f..e77ee77 100644 --- a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 +++ b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 @@ -20,7 +20,12 @@ the X2go session keyboard settings requested from the client side. .PP If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error will be raised). +.SH RETURN VALUES +If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is +returned. Also, if the file ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard is not presented at the +expected location, a zero-exitcode is returned. .PP +If the command fails on its way, then the exitcode of the failing command is returned. .SH FILES ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard .PP diff --git a/x2goserver-extensions/man/man8/x2goversion.8 b/x2goserver-extensions/man/man8/x2goversion.8 index bb07d83..4d99559 100644 --- a/x2goserver-extensions/man/man8/x2goversion.8 +++ b/x2goserver-extensions/man/man8/x2goversion.8 @@ -26,7 +26,10 @@ component's version is printed to stdout. .PP The \fBx2goversion\fR tool can be used by X2go client implementations to query server-side versions of X2go components. +.SH RETURN VALUES +\fBx2goversion\fR reports X2go component version information to stdout. .PP +As exitcode \fBx2goversion\fR always returns 0. .SH FILES /usr/share/x2go/versions/VERSION.* .PP diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 24fd6db..85d43a9 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -86,7 +86,7 @@ $X2GO_LIB_PATH/x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" } || { - err_msg="ERROR: failed to resume session with ID $SESSION_NAME" - echo "$err_msg" 1>&2 - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" + err_msg="ERROR: failed to resume session with ID $SESSION_NAME" + echo "$err_msg" 1>&2 + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" } diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 6d31d77..c27f142 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -19,6 +19,10 @@ x2gocmdexitmessage <session_id> \fBx2gocmdexitmessage\fR is run with X2go user privileges. .PP +.SH RETURN VALUES +\fBx2gocmdexitmessage\fR prints out the last command's exit message. +.PP +As exitcode \fBx2gocmdexitmessage\fR always returns 0. .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project (http://www.x2go.org) diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 62d1782..3703f79 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -25,7 +25,10 @@ a list of available desktops that may be candidates for X2go desktop sharing (sh The list of desktops will include local desktop sessions (launched via KDM, GDM, etc.) run by the same user, X2go desktop sessions run by the same user and desktop sessions of other users (local or remote) that are announced via the \fBx2godesktopsharing\fR utility. +.SH RETURN VALUES +A list of available X desktops, line-by-line. .PP +As exitcode \fBx2golistdesktop\fR always returns 0. .SH SEE ALSO x2godesktopsharing(1) .SH AUTHOR diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index ad6ec49..adbbac6 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -12,7 +12,7 @@ x2golistsessions \- List Available X2go Sessions for User 'nh .fi .ad l -x2golistsessions [<server_hostname|--all-servers] +x2golistsessions [<server_hostname>|--all-servers] .SH DESCRIPTION \fBx2golistsessions\fR returns a list of running or suspended X2go sessions for X2go server <server_hostname>. @@ -24,7 +24,31 @@ a list of available X2go sessions. If \fBx2golistsessions\fR is executed with the \fI--all-servers\fR option then the central database of your X2go cluster is queried for running/suspended sessions belonging to the user executing this command. These sessions may be active on any of the X2go servers within you cluster. +.SH RETURN VALUES +A line-by-line list of available X2go sessions. Each line consists of several session attribute fields separated by the pipe +symbol (,,|''). .PP +The meaning of the session attributes of each output line are shown below: + + field 01: <agent_pid> + field 02: <session_id> + field 03: <port> + field 04: <host> + field 05: <state> + field 06: <init_time> + field 07: <session_cookie> + field 08: <client_ip> + field 09: <gr_port> + field 10: <snd_port> + field 11: <last_time> + field 12: <user> + field 13: <age_in_secs> + field 14: <sshfs_port> + +.PP +As exitcode \fBx2golistsessions\fR always returns 0. +.SH SEE ALSO +x2golistsessions_root(8), x2golistdesktops(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-session(8) .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project (http://www.x2go.org) diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index f92e6b8..9c7f18e 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -20,6 +20,10 @@ If no server hostname is given at the command line, the session list query runs .PP \fBx2golistsessions_root\fR must be run with root privileges. .PP +.SH RETURN VALUES +Same as explained in x2golistsessions(8). +.SH SEE ALSO +x2golistsessions(8) .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project (http://www.x2go.org) diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index b51f928..33b8f09 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -40,7 +40,26 @@ A list of client-side folders or device mount points that shall be mounted for X .SH PERMISSIONS X2go uses the fuse-based SSH filesystem (SSHFS) for sharing client-side file ressources with X2go sessions. Users that shall use X2go folder sharing must be members of the X2go server's ,,fuse'' POSIX group. +.SH RETURN VALUES +\fBx2gomountdirs\fR returns some mount point information to stdout if the mounting process has been successful. +The mount results are printed line-by-line. The individual lines must be interpreted as shown below: + + line 01: dirs:<local_path>__REVERSESSH_PORT__<sshfs_port> + line 02: ssh port:<sshfs_port> + line 03: Host:<client_ip> + line 04: User:<user> + line 05: inserted, sshfs -o <options> \\ + "<user">@<client_ip>:"<local_path>" \\ + "<server_path>" -p <sshfs_port> + line 06: mount <local_path> ok + line 07: fname: <desktop_icon_name> +.PP +If mounting of a client folder fails, either of the errors is returned (on stdout): + + error 01: mounting of <local_path> failed + error 02: insertion of <local_path> failed (already mounted?), not mounting .PP +As exitcode \fBx2gomoundirs\fR always returns 0. .SH SEE ALSO x2goumount-session(8) .SH AUTHOR diff --git a/x2goserver/man/man8/x2goprint.8 b/x2goserver/man/man8/x2goprint.8 index a8d8ec1..1075652 100644 --- a/x2goserver/man/man8/x2goprint.8 +++ b/x2goserver/man/man8/x2goprint.8 @@ -53,6 +53,12 @@ is required on X2go server(s) and the central CUPS server. .PP Refer to http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu for further information. .PP +.SH RETURN VALUES +By \fBx2goprint\fR nothing is reported on stdout or stderr. +.PP +If \fBx2goprint\fR has run successfully, an exitcode of 0 is returned. If the script has either been +called by a non-root user or with the wrong number of command line arguments, a non-zero exitcode is +returned. .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project (http://www.x2go.org) diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index 1004fb1..38e1661 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -19,6 +19,10 @@ x2goresume-session <session_id> .PP This command is normally issued by an X2go client application with X2go user privileges. +.SH RETURN VALUES +By \fBx2goresume-session\fR nothing is reported on stdout or stderr. +.PP +As exitcode \fBx2goresume-session\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goruncommand(8), x2gosuspend-session(8), x2goterminate-session(8) .SH AUTHOR diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index c8ca8b6..4a64515 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -39,7 +39,10 @@ Either of the possible sound systems supported by X2go: pulse, esd, arts (obsole .TP \*(T<\fB\<session_type>\fR\*(T> Allowed values for <session_type> are: D (desktop) and R (rootless). +.SH RETURN VALUES +By \fBx2goruncommand\fR nothing is reported on stdout or stderr. .PP +As exitcode \fBx2goruncommand\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-sessions(8) .SH AUTHOR diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 0296f4b..65bc07e 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -50,8 +50,8 @@ The command given by the <command> argument is only used to create the session I actual execution of a command is handled by \fBx2goruncommand\fR. .PP .SH RETURN VALUES -A list of parameters will be returned after a successful session startup. Each value will be presented on -a new line: +A list of session attributes is returned after successful session startup. Session attributes will be presented +on a line-by-line basis: \fB<X_display_number>\fR \fB<session_cookie_hash>\fR diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index c24a077..96e3e9e 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -18,7 +18,10 @@ x2gosuspend-session <session_id> \fBx2gosuspend-session\fR suspends the running session with session ID <session_id>. .PP This command is normally issued by an X2go client application with X2go user privileges. +.SH RETURN VALUES +By \fBx2gosuspend-session\fR nothing is reported on stdout or stderr. .PP +As exitcode \fBx2gosuspend-session\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goruncommand(8), x2goresume-session(8), x2goterminate-session(8) .SH AUTHOR diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index f007a99..9089c04 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -18,7 +18,10 @@ x2goterminate-session <session_id> \fBx2goterminate-session\fR cleanly terminates the running or suspended session with session ID <session_id>. .PP This command is normally issued by an X2go client application with X2go user privileges. +.SH RETURN VALUES +By \fBx2goterminate-session\fR nothing is reported on stdout or stderr. .PP +As exitcode \fBx2goterminate-session\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goruncommand(8), x2goresume-session(8), x2gosuspend-session(8) .SH AUTHOR diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index 151dea1..a2cc555 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -27,9 +27,14 @@ Unmount shared folder(s) as registered for X2go session ID <session_id> in the X \*(T<\fB\<local_path_on_client>\fR\*(T> Optionally, you can name a local path name (path name as found on the client-side) here. If given, only the named folder is unshared from the X2go session <session_id>. - +.PP If this optional argument is omitted, then ALL session folders will be unshared (including spool folders for printing and MIME box). - +.SH RETURN VALUES +.SH RETURN VALUES +By \fBx2goumount-session\fR nothing is reported on stdout or stderr. +.PP +As exitcode \fBx2goumount-session\fR return 0 on successful an umount action. If there is a failure during +unmounting a shared folder a non-zero exit code is returned. .SH SEE ALSO x2gomountdirs(8) .SH AUTHOR 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-2-276-gc12be79
by git-admin＠x2go.org 22 Sep '11

22 Sep '11

The branch, master has been updated via c12be797c5798f68a73ce3581fb6b46a4912b03a (commit) via d78d8b3ed09e72f85e2e74c9382e3772b7b279a2 (commit) from 2c3b46ea488384648ff4f3fad17a806a99b290a4 (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 c12be797c5798f68a73ce3581fb6b46a4912b03a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 18:00:02 2011 +0200 tab fixes commit d78d8b3ed09e72f85e2e74c9382e3772b7b279a2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 17:49:08 2011 +0200 add newline at EOF ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2goterminate-session | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 18d019f..451e328 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -315,4 +315,4 @@ unlink($key); unlink("$key.ident"); # closing syslog -closelog; \ No newline at end of file +closelog; diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 0780cdf..bc84950 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -38,9 +38,9 @@ $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null kill -TERM $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully" } || { - err_msg="ERROR: failed to terminate session with ID $SESSION_NAME" - echo "$err_msg" 1>&2 - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" + err_msg="ERROR: failed to terminate session with ID $SESSION_NAME" + echo "$err_msg" 1>&2 + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" } export HOSTNAME 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

pinentry-x2go.git - master (branch) updated: 0.7.5.0-4-g5211f3a
by git-admin＠x2go.org 22 Sep '11

22 Sep '11

The branch, master has been updated via 5211f3a90760a40ede5c0062b19fdde123058ae8 (commit) from fe8556495321fd2dc2d3569b6573a693100ec6f3 (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 5211f3a90760a40ede5c0062b19fdde123058ae8 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Thu Sep 22 09:02:57 2011 +0200 Set font size in pinentry dialog to 14 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- pinentry-x2go/pinentrydialog.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dce36a0..3d509a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ pinentry-x2go (0.7.5.0-1~x2go1) UNRELEASED; urgency=low - * Set font size in pinentry dialog to 16 + * Set font size in pinentry dialog to 14 - -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 22 Sep 2011 08:50:01 +0200 + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 22 Sep 2011 09:02:30 +0200 pinentry-x2go (0.7.5.0-0~x2go1) unstable; urgency=low diff --git a/pinentry-x2go/pinentrydialog.cpp b/pinentry-x2go/pinentrydialog.cpp index 3465cb7..87eb2bf 100644 --- a/pinentry-x2go/pinentrydialog.cpp +++ b/pinentry-x2go/pinentrydialog.cpp @@ -50,7 +50,7 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* , bool ) _bs= new QPushButton(QString(8592), this ); QFont f=_bs->font(); - f.setPointSize(16); + f.setPointSize(20); _bs->setFont(f); _icon->hide(); _error->hide(); @@ -88,7 +88,6 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* , bool ) _bs->setFixedSize(QSize(_num[0]->sizeHint()).height(),QSize(_num[0]->sizeHint()).height()); _bs->setFocusPolicy(Qt::NoFocus); _edit->setFixedHeight(_num[0]->sizeHint().height()); - _edit->setFont(f); _ok->setDefault(true); QVBoxLayout* mlay=new QVBoxLayout(this); @@ -125,6 +124,8 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* , bool ) this, SLOT (reject ())); connect (_edit,SIGNAL(bs_pressed()),this,SLOT(slot_bs())); connect (_edit,SIGNAL(cancel_pressed()),this,SLOT(reject())); + f.setPointSize(14); + _edit->setFont(f); _edit->setFocus(); } hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for X2goClient) 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 "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2goClient).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.0-3-gfe85564
by git-admin＠x2go.org 22 Sep '11

22 Sep '11

The branch, master has been updated via fe8556495321fd2dc2d3569b6573a693100ec6f3 (commit) from 7ba95215cb0bdbecd52529be767e01339f5c202e (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 fe8556495321fd2dc2d3569b6573a693100ec6f3 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Thu Sep 22 08:51:18 2011 +0200 Set font size in pinentry dialog to 16 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ pinentry-x2go/pinentrydialog.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4c2a6e7..dce36a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pinentry-x2go (0.7.5.0-1~x2go1) UNRELEASED; urgency=low + + * Set font size in pinentry dialog to 16 + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 22 Sep 2011 08:50:01 +0200 + pinentry-x2go (0.7.5.0-0~x2go1) unstable; urgency=low * Changed version numbering scheme. diff --git a/pinentry-x2go/pinentrydialog.cpp b/pinentry-x2go/pinentrydialog.cpp index d4c838b..3465cb7 100644 --- a/pinentry-x2go/pinentrydialog.cpp +++ b/pinentry-x2go/pinentrydialog.cpp @@ -50,7 +50,7 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* , bool ) _bs= new QPushButton(QString(8592), this ); QFont f=_bs->font(); - f.setPointSize(20); + f.setPointSize(16); _bs->setFont(f); _icon->hide(); _error->hide(); hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for X2goClient) 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 "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2goClient).

1 0

x2goadmincenter.git - master (branch) updated: fe6fabbadf912adec623835961884679fe19fb35
by git-admin＠x2go.org 22 Sep '11

22 Sep '11

The branch, master has been updated via fe6fabbadf912adec623835961884679fe19fb35 (commit) from daa0777c0f62c864a15617f95cda4057f3af6679 (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 fe6fabbadf912adec623835961884679fe19fb35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 02:36:58 2011 +0200 fix plugin build ----------------------------------------------------------------------- Summary of changes: debian/x2goadmincenter.install | 5 +++-- x2goadmincenter/Makefile | 26 ++++++++++++++++++++++---- x2goadmincenter/lib/x2goadmincenter/plugins | 1 + x2goadmincenter/x2goadmincenter.cpp | 2 +- 4 files changed, 27 insertions(+), 7 deletions(-) create mode 120000 x2goadmincenter/lib/x2goadmincenter/plugins The diff of changes is: diff --git a/debian/x2goadmincenter.install b/debian/x2goadmincenter.install index f6c43b7..b4cb467 100644 --- a/debian/x2goadmincenter.install +++ b/debian/x2goadmincenter.install @@ -1,2 +1,3 @@ -x2goadmincenter/.build/x2goadmincenter usr/bin -x2goadmincenter/icons/x2goadmincenter.xpm usr/share/x2goadmincenter/icons/ +x2goadmincenter/.build/x2goadmincenter usr/bin +x2goadmincenter/icons/x2goadmincenter.xpm usr/share/x2goadmincenter/icons/ +x2goadmincenter/plugins/* usr/lib/x2goadmincenter/plugins/ diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index 610c3bb..b0b44f7 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -4,6 +4,8 @@ SRC_DIR=$(CURDIR) BUILD_DIR=$(SRC_DIR)/.build BUILD_BINARY=$(CLIENT_DIR)/x2goadmincenter +PLUGINS_DIR=$(SRC_DIR)/plugins + SHELL=/bin/bash INSTALL_DIR=install -d -o root -g root -m 755 @@ -18,12 +20,13 @@ PREFIX=/usr/local BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share MANDIR=$(SHAREDIR)/man +LIBDIR=$(PREFIX)/lib/x2goadmincenter all: build build: build-arch build-indep -build-arch: build_admincenter +build-arch: build_admincenter build_plugins build-indep: build_man @@ -31,10 +34,13 @@ build_admincenter: mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && qmake-qt4 ../x2goadmincenter.pro cd $(BUILD_DIR) && $(MAKE) +build_plugins: + for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && qmake-qt4 $$module.pro && make; done + build_man: make -f Makefile.man2html build -clean: clean_admincenter clean_man +clean: clean_admincenter clean_plugins clean_man find . -type f -name '*.o' -exec rm -vf {} + find . -type f -name 'moc_*.cpp' -exec rm -vf {} + find . -type f -name 'ui_*.h' -exec rm -vf {} + @@ -45,28 +51,40 @@ clean: clean_admincenter clean_man clean_admincenter: rm -fr $(CLIENT_DIR) +clean_plugins: + rm -fr $(PLUGINS_DIR)/* + clean_man: make -f Makefile.man2html clean -install: install_admincenter install_man +install: install_admincenter install_plugins install_man install_admincenter: $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ $(INSTALL_FILE) $(SRC_DIR)/icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm +install_plugins: + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/ + $(INSTALL_FILE) $(PLUGINS_DIR)/* $(LIBDIR)/plugins/ + install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL_FILE) $(SRC_DIR)/man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8 -uninstall: uninstall_admincenter uninstall_man +uninstall: uninstall_admincenter uninstall_plugins uninstall_man uninstall_admincenter: $(RM_FILE) $(BINDIR)/x2goadmincenter $(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm $(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons +uninstall_plugins: + $(RM_FILE) $(LIBDIR)/plugins/* + $(RM_DIR) $(LIBDIR)/plugins/ + $(RM_DIR) $(LIBDIR)/ + uninstall_man: $(RM_FILE) $(MANDIR)/man8/x2goadmincenter.8.gz $(RM_DIR) $(MANDIR)/man8 diff --git a/x2goadmincenter/lib/x2goadmincenter/plugins b/x2goadmincenter/lib/x2goadmincenter/plugins new file mode 120000 index 0000000..9aa30ad --- /dev/null +++ b/x2goadmincenter/lib/x2goadmincenter/plugins @@ -0,0 +1 @@ +../../plugins \ No newline at end of file diff --git a/x2goadmincenter/x2goadmincenter.cpp b/x2goadmincenter/x2goadmincenter.cpp index f4d911a..6a77027 100644 --- a/x2goadmincenter/x2goadmincenter.cpp +++ b/x2goadmincenter/x2goadmincenter.cpp @@ -120,7 +120,7 @@ X2GoAdminCenter::~X2GoAdminCenter() void X2GoAdminCenter::loadPlugins() { QDir pluginsDir = QDir(qApp->applicationDirPath()); - pluginsDir.cd("../lib/x2goadmincenter/modules"); + pluginsDir.cd("../lib/x2goadmincenter/plugins"); foreach (QString fileName, pluginsDir.entryList(QDir::Files)) { QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); hooks/post-receive -- x2goadmincenter.git (X2go Administration Center) 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 "x2goadmincenter.git" (X2go Administration Center).

1 0

x2goadmincenter.git - master (branch) updated: daa0777c0f62c864a15617f95cda4057f3af6679
by git-admin＠x2go.org 22 Sep '11

22 Sep '11

The branch, master has been updated via daa0777c0f62c864a15617f95cda4057f3af6679 (commit) from 0373b618790b8493f2fa081565751771cfd12bd2 (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 daa0777c0f62c864a15617f95cda4057f3af6679 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 02:05:09 2011 +0200 path fix for plugins/modules ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/x2goadmincenter.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2goadmincenter/x2goadmincenter.cpp b/x2goadmincenter/x2goadmincenter.cpp index f6fae46..f4d911a 100644 --- a/x2goadmincenter/x2goadmincenter.cpp +++ b/x2goadmincenter/x2goadmincenter.cpp @@ -120,7 +120,7 @@ X2GoAdminCenter::~X2GoAdminCenter() void X2GoAdminCenter::loadPlugins() { QDir pluginsDir = QDir(qApp->applicationDirPath()); - pluginsDir.cd("plugins"); + pluginsDir.cd("../lib/x2goadmincenter/modules"); foreach (QString fileName, pluginsDir.entryList(QDir::Files)) { QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); hooks/post-receive -- x2goadmincenter.git (X2go Administration Center) 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 "x2goadmincenter.git" (X2go Administration Center).

1 0

x2goadmincenter.git - master (branch) updated: 0373b618790b8493f2fa081565751771cfd12bd2
by git-admin＠x2go.org 21 Sep '11

21 Sep '11

The branch, master has been updated via 0373b618790b8493f2fa081565751771cfd12bd2 (commit) via 25834524adfa447f106eff9b43c457b93205b0da (commit) from f592fa1a4e5ecef68d9cd869fcd443613fefafe7 (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 0373b618790b8493f2fa081565751771cfd12bd2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 01:59:03 2011 +0200 typo fix in error message commit 25834524adfa447f106eff9b43c457b93205b0da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 01:55:10 2011 +0200 x2goadminserver package is arch-indep, description fixes in control file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 12 ++++++------ x2goadmincenter/x2goadmincenter.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 225b5a5..6d25c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,5 +2,6 @@ x2goadmincenter (0.0.0.1-0~x2go1) UNRELEASED; urgency=low * Initial package build for Debian/Ubuntu. * Reduce build dependencies to a minimal set of packages. + * x2goadminserver package is arch-indep, description fixes in control file. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 21 Sep 2011 21:12:56 +0200 diff --git a/debian/control b/debian/control index a8966ed..250e226 100644 --- a/debian/control +++ b/debian/control @@ -29,15 +29,15 @@ Description: X2go Administration Center (Qt4 client) - authentication by smartcard and USB stick . x2goadmincenter is a graphical client (Qt4) for the X2go administration - interface. You can use it to administrate single X2go server, as well as + interface. You can use it to administrate a single X2go server, as well as multi-server based X2go clusters. Package: x2goadminserver -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Description: X2go Administration Server (CGI) +Description: X2go Administration Server (Perl/CGI) X2go is a serverbased computing environment with - session resuming - low bandwith support @@ -46,8 +46,8 @@ Description: X2go Administration Server (CGI) - audio support - authentication by smartcard and USB stick . - x2goadmincenter is the server side component of the X2go Administration - center. X2go administration server can handle a single X2go server, as well as + x2goadminserver is the server-side component of the X2go Administration + center. X2go Administration Server can handle a single X2go server, as well as multi-server based X2go clusters. . - For installation instruction/howtos/FAQs please visit http://wiki.x2go.org \ No newline at end of file + For installation instruction/howtos/FAQs please visit http://wiki.x2go.org diff --git a/x2goadmincenter/x2goadmincenter.cpp b/x2goadmincenter/x2goadmincenter.cpp index a9f8acc..f6fae46 100644 --- a/x2goadmincenter/x2goadmincenter.cpp +++ b/x2goadmincenter/x2goadmincenter.cpp @@ -139,7 +139,7 @@ void X2GoAdminCenter::loadPlugins() iface->widget()->hide(); } else - qDebug()<<fileName<<" loading filed!"<<loader.errorString(); + qDebug()<<fileName<<" loading failed!"<<loader.errorString(); } } hooks/post-receive -- x2goadmincenter.git (X2go Administration Center) 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 "x2goadmincenter.git" (X2go Administration Center).

1 0

x2goadmincenter.git - master (branch) updated: f592fa1a4e5ecef68d9cd869fcd443613fefafe7
by git-admin＠x2go.org 21 Sep '11

21 Sep '11

The branch, master has been updated via f592fa1a4e5ecef68d9cd869fcd443613fefafe7 (commit) from 1965c9961053ebc3a92106005d5f44ed4ee650e4 (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 f592fa1a4e5ecef68d9cd869fcd443613fefafe7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 01:30:46 2011 +0200 fix for dh_installdocs ----------------------------------------------------------------------- Summary of changes: debian/x2goadmincenter.docs | 2 +- debian/x2goadminserver.docs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2goadmincenter.docs b/debian/x2goadmincenter.docs index 4a997e1..9404f5c 100644 --- a/debian/x2goadmincenter.docs +++ b/debian/x2goadmincenter.docs @@ -1,2 +1,2 @@ AUTHORS -.build_man2html/html +x2goadmincenter/.build_man2html/html diff --git a/debian/x2goadminserver.docs b/debian/x2goadminserver.docs index c36cad1..b569efe 100644 --- a/debian/x2goadminserver.docs +++ b/debian/x2goadminserver.docs @@ -1,2 +1,2 @@ AUTHORS -#.build_man2html/html +x2goadminserver/.build_man2html/html hooks/post-receive -- x2goadmincenter.git (X2go Administration Center) 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 "x2goadmincenter.git" (X2go Administration Center).

1 0

x2goadmincenter.git - master (branch) updated: 1965c9961053ebc3a92106005d5f44ed4ee650e4
by git-admin＠x2go.org 21 Sep '11

21 Sep '11

The branch, master has been updated via 1965c9961053ebc3a92106005d5f44ed4ee650e4 (commit) from dc2c73feb7ba39e022d3bedf5c0ff0a987cbfe92 (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 1965c9961053ebc3a92106005d5f44ed4ee650e4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 01:25:59 2011 +0200 Reduce build dependencies to a minimal set of packages. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 544a6e6..225b5a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ x2goadmincenter (0.0.0.1-0~x2go1) UNRELEASED; urgency=low * Initial package build for Debian/Ubuntu. + * Reduce build dependencies to a minimal set of packages. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 21 Sep 2011 21:12:56 +0200 diff --git a/debian/control b/debian/control index 4b33b89..a8966ed 100644 --- a/debian/control +++ b/debian/control @@ -7,10 +7,7 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), libqt4-dev, - libldap2-dev, - libssh-dev (>= 0.4.7), libx11-dev, - doxygen, man2html-base | man2html Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2goadmincenter @@ -21,7 +18,7 @@ Package: x2goadmincenter Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, + ${misc:Depends} Description: X2go Administration Center (Qt4 client) X2go is a serverbased computing environment with - session resuming @@ -39,8 +36,7 @@ Package: x2goadminserver Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - nxproxy + ${misc:Depends} Description: X2go Administration Server (CGI) X2go is a serverbased computing environment with - session resuming hooks/post-receive -- x2goadmincenter.git (X2go Administration Center) 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 "x2goadmincenter.git" (X2go Administration Center).

1 0

buildscripts.git - master (branch) updated: 1d27752bd12d2f7985462e7a135ec8d3211ac19a
by git-admin＠x2go.org 21 Sep '11

21 Sep '11

The branch, master has been updated via 1d27752bd12d2f7985462e7a135ec8d3211ac19a (commit) via 7cc493c6859a79e285aed81f2fe522da8515281d (commit) from 466363a51a5d2eba9d190269d384cc92212ae941 (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 1d27752bd12d2f7985462e7a135ec8d3211ac19a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 01:23:04 2011 +0200 include x2goadmincenter in nightly build chain commit 7cc493c6859a79e285aed81f2fe522da8515281d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 22 01:23:00 2011 +0200 fix for x2go-updatebuildmain script ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-all-packages | 1 + bin/x2go-updatebuildmain | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-all-packages b/bin/x2go-build-all-packages index f5e2d6f..19c84ae 100755 --- a/bin/x2go-build-all-packages +++ b/bin/x2go-build-all-packages @@ -39,6 +39,7 @@ x2goclient heuler master\n nxproxy heuler master\n cups-x2go heuler master\n x2godesktopsharing heuler master\n +x2goadmincenter heuler master\n x2gognomebindings heuler master\n x2golxdebindings heuler master\n x2goplasmabindings heuler master\n diff --git a/bin/x2go-updatebuildmain b/bin/x2go-updatebuildmain index ad37da0..3716ed4 100755 --- a/bin/x2go-updatebuildmain +++ b/bin/x2go-updatebuildmain @@ -30,5 +30,5 @@ test -z $1 || test -d ./.git || { } # update the build-main branch with our newest blessed reference -git pull --all +git branch build-main &>/dev/null || true git push origin $REF:build-main hooks/post-receive -- buildscripts.git (buildscripts upstream project) 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 "buildscripts.git" (buildscripts upstream project).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits