x2go-commits January 2012

x2go-commits@lists.x2go.org

1 participants
126 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.4-1-g9b605ad
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 9b605ad1a0fefe128f1b0841db144960a34eb5b5 (commit) from 247c0e307b5ef1ccb1a205e08aa7dd27f96e207f (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 9b605ad1a0fefe128f1b0841db144960a34eb5b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 16:25:48 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 04de192..ef63c57 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.4 +1.0.1.5 diff --git a/debian/changelog b/debian/changelog index c7ec354..fb27a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gothinclient (1.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 16:25:09 +0100 + x2gothinclient (1.0.1.4-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.4): hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2goclient.git - master (branch) updated: 3.99.0.4-4-gc1978d3
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via c1978d323ecae3d457991efd0227b54648f55098 (commit) via 9466e124dec28220afaeebc9e42f0f3da8a6412c (commit) via 9be7d2eac5f8f4a24edc6b102ea55e09ac247ef3 (commit) via 85a3aed4bb827c77ce03e46ea3ef6cd07e8a7c55 (commit) from 1d1c2551d31b7f579e0596f43571da7dfa34c17b (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 c1978d323ecae3d457991efd0227b54648f55098 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:30:19 2012 +0100 happy new year commit 9466e124dec28220afaeebc9e42f0f3da8a6412c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:23:53 2012 +0100 Fix version string on man page. commit 9be7d2eac5f8f4a24edc6b102ea55e09ac247ef3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:22:59 2012 +0100 Rename in human readable text strings ,,X2go'' to ,,X2Go''. commit 85a3aed4bb827c77ce03e46ea3ef6cd07e8a7c55 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:20:19 2012 +0100 Version increment, continue development... ----------------------------------------------------------------------- Summary of changes: LICENSE | 6 +++--- Makefile.docupload | 2 +- VERSION | 2 +- brokerpassdlg.cpp | 2 +- brokerpassdlg.h | 2 +- contest.cpp | 2 +- contest.h | 2 +- debian/changelog | 14 ++++++++++++-- debian/copyright | 8 ++++---- desktop/x2goclient.desktop | 2 +- examples/x2goclient-cli | 2 +- man/man1/x2goclient.1 | 10 +++++----- ongetpass.cpp | 2 +- onmainwindow.cpp | 2 +- onmainwindow.h | 2 +- onmainwindow_part2.cpp | 2 +- onmainwindow_part3.cpp | 2 +- onmainwindow_part4.cpp | 2 +- onmainwindow_privat.h | 2 +- portable/stopu3client.cpp | 4 ++-- userbutton.cpp | 2 +- userbutton.h | 2 +- version.h | 2 +- x2goclient.cpp | 2 +- x2goclient_de.ts | 4 ++-- x2goclient_fr.ts | 2 +- x2goclient_ru.ts | 2 +- x2goplugin.rc | 10 +++++----- xsettingsui.ui | 2 +- xsettingswidget.cpp | 2 +- xsettingswidget.h | 2 +- 31 files changed, 57 insertions(+), 47 deletions(-) The diff of changes is: diff --git a/LICENSE b/LICENSE index 82828ef..0479009 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2007 Obviously Nice - http://www.obviouslynice.de +Copyright (C) 2005-2012 Obviously Nice - http://www.obviouslynice.de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -Copyright (C) 2007 Oleksandr Shneyder +Copyright (C) 2005-2012 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de -Copyright (C) 2007 Heinz-Markus Graesing +Copyright (C) 2005-2012 Heinz-Markus Graesing heinz-m.graesing(a)obviously-nice.de diff --git a/Makefile.docupload b/Makefile.docupload index fa2190f..6c3d232 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for x2goclient -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*($.*$).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/VERSION b/VERSION index 7e58983..e98a62b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.0.4 +3.99.0.5 diff --git a/brokerpassdlg.cpp b/brokerpassdlg.cpp index b3a7571..7d7432b 100644 --- a/brokerpassdlg.cpp +++ b/brokerpassdlg.cpp @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder + Copyright (C) 2005-2012 Oleksandr Shneyder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/brokerpassdlg.h b/brokerpassdlg.h index 90b3ba2..6123171 100644 --- a/brokerpassdlg.h +++ b/brokerpassdlg.h @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder + Copyright (C) 2005-2012 Oleksandr Shneyder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/contest.cpp b/contest.cpp index 2fe6895..cefab6b 100644 --- a/contest.cpp +++ b/contest.cpp @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder + Copyright (C) 2005-2012 Oleksandr Shneyder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/contest.h b/contest.h index ca34c57..e345148 100644 --- a/contest.h +++ b/contest.h @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder + Copyright (C) 2005-2012 Oleksandr Shneyder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/changelog b/debian/changelog index 60c4563..1ac9205 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2goclient (3.99.0.5-0~x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.99.0.5): + - Rename in human readable text strings ,,X2go'' to ,,X2Go''. + - Fix version string on man page. + + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 15:18:16 +0100 + x2goclient (3.99.0.4-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] @@ -49,7 +59,7 @@ x2goclient (3.99.0.1-0~x2go1) unstable; urgency=low - Add build_man/clean_man stanzas to Makefile. * Explicitly use source format 3.0 (native). * Build-depend on libssh-dev (>=0.4.7). - * Update menu file in /debian folder (rename title to ,,X2go Client (Qt)''). + * Update menu file in /debian folder (rename title to ,,X2Go Client (Qt)''). * Do not run man2html from rules file anymore. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:11:50 +0200 @@ -113,7 +123,7 @@ x2goclient (3.01-18) unstable; urgency=low x2goclient (3.01-17) unstable; urgency=low - * Minimize X2go Client to system tray thank Joachim Langenbach <joachim(a)falaba.de> for patch + * Minimize X2Go Client to system tray thank Joachim Langenbach <joachim(a)falaba.de> for patch -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 27 Jan 2011 12:32:29 +0100 diff --git a/debian/copyright b/debian/copyright index a340aaf..06180fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +Copyright (C) 2005-2012 X2Go Project - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,15 +17,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -Copyright (C) 2007-2011 Oleksandr Shneyder +Copyright (C) 2005-2012 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de -Copyright (C) 2007-2011 Heinz-Markus Graesing +Copyright (C) 2005-2012 Heinz-Markus Graesing heinz-m.graesing(a)obviously-nice.de On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2007-2011, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and +The Debian packaging is (C) 2005-2012 , Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and is licensed under the GPL, see above. diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 5cc4280..6b1bca9 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.0.4 +Version=3.99.0.5 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/examples/x2goclient-cli b/examples/x2goclient-cli index 1ed658c..65681ab 100755 --- a/examples/x2goclient-cli +++ b/examples/x2goclient-cli @@ -1,7 +1,7 @@ #!/usr/bin/perl ############################################################################ -# Copyright (C) 2006 by Oleksandr Shneyder # +# Copyright (C) 2006-2012 by Oleksandr Shneyder # # oleksandr.shneyder(a)obviously-nice.de # # # # This program is free software; you can redistribute it and/or modify # diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index b4f2bf4..f4c98c8 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "July 2011" "Version 3.0.1.x" "X2go Client (Qt4)" +.TH x2goclient 1 "July 2011" "Version 3.99.0.x" "X2Go Client (Qt4)" .SH NAME -x2goclient \- Client application to launch server-side X2go sessions. +x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2goclient \- Client application to launch server-side X2go sessions. \fBx2goclient\fR <options> .SH DESCRIPTION -\fBx2goclient\fR is a GUI application for launching server-side X2go sessions. +\fBx2goclient\fR is a GUI application for launching server-side X2Go sessions. .PP .SH OPTIONS \fBx2goclient\fR has the following options: @@ -80,7 +80,7 @@ Activate sound for session, not enabled by default. Which soundsystem to use: arts, esd, pulse (default: arts). .SH THIN CLIENT OPTIONS The following command line options are primarily interesting if \fBx2goclient\fR is used -as a login manager on X2go thin clients. +as a login manager on X2Go thin clients. .TP \*(T<\fB\-\-session=<session-profile-name>\fR\*(T> Pre-selection of session at client startup. @@ -125,5 +125,5 @@ Failover LDAP Server portnumber (default: 389). Failover LDAP Server hostname. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/ongetpass.cpp b/ongetpass.cpp index b3194e4..ef548d6 100644 --- a/ongetpass.cpp +++ b/ongetpass.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 81dce94..f583283 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* Copyright (C) 2005-2011 by Oleksandr Shneyder * +* Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/onmainwindow.h b/onmainwindow.h index 4a41d58..79d60e4 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2005-2011 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index aa98603..d6919f7 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* Copyright (C) 2005-2011 by Oleksandr Shneyder * +* Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index abd29f5..a2ff1e6 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* Copyright (C) 2005-2011 by Oleksandr Shneyder * +* Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 52b381d..39343a1 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* Copyright (C) 2005-2011 by Oleksandr Shneyder * +* Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 98cef6e..9e4375a 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2011 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/portable/stopu3client.cpp b/portable/stopu3client.cpp index 2bfbd5d..3cc7c67 100644 --- a/portable/stopu3client.cpp +++ b/portable/stopu3client.cpp @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2010 by Oleksandr Shneyder * +* Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * @@ -19,7 +19,7 @@ ***************************************************************************/ /* - this is helper program to stop running in "portable" mode X2go Client + this is helper program to stop running in "portable" mode X2Go Client before U3 USB-drive will be unmounted */ diff --git a/userbutton.cpp b/userbutton.cpp index e77cf12..21787ca 100644 --- a/userbutton.cpp +++ b/userbutton.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/userbutton.h b/userbutton.h index 03c5c84..7606d97 100644 --- a/userbutton.h +++ b/userbutton.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/version.h b/version.h index 6e5c5e0..5647dc5 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.0.4" +#define VERSION "3.99.0.5" diff --git a/x2goclient.cpp b/x2goclient.cpp index 580ee3b..d2d0b94 100644 --- a/x2goclient.cpp +++ b/x2goclient.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 01de7a5..37176b3 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -2093,7 +2093,7 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="printdialog.ui" line="16"/> <source>Print - X2Go client</source> - <translation>Drucken - X2go Client</translation> + <translation>Drucken - X2Go Client</translation> </message> </context> <context> @@ -2920,7 +2920,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="27"/> - <source>You must restart the X2go Client for the changes to take effect</source> + <source>You must restart the X2Go Client for the changes to take effect</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 6fcba31..1cd6797 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -2337,7 +2337,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="27"/> - <source>You must restart the X2go Client for the changes to take effect</source> + <source>You must restart the X2Go Client for the changes to take effect</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 46271fe..b49003a 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -2901,7 +2901,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="27"/> - <source>You must restart the X2go Client for the changes to take effect</source> + <source>You must restart the X2Go Client for the changes to take effect</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goplugin.rc b/x2goplugin.rc index 05ee2b0..2b05a07 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,0,4 - PRODUCTVERSION 3,99,0,4 + FILEVERSION 3,99,0,5 + PRODUCTVERSION 3,99,0,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 0 ,4\0" + VALUE "FileVersion", "3, 99, 0 ,5\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0" - VALUE "ProductVersion", "3, 99, 0, 4\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.0.5\0" + VALUE "ProductVersion", "3, 99, 0, 5\0" END END BLOCK "VarFileInfo" diff --git a/xsettingsui.ui b/xsettingsui.ui index fa06cbf..2f85125 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -24,7 +24,7 @@ </font> </property> <property name="text"> - <string>You must restart the X2go Client for the changes to take effect</string> + <string>You must restart the X2Go Client for the changes to take effect</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/xsettingswidget.cpp b/xsettingswidget.cpp index 7cd117b..a76fa61 100644 --- a/xsettingswidget.cpp +++ b/xsettingswidget.cpp @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/xsettingswidget.h b/xsettingswidget.h index 0a441cf..0627350 100644 --- a/xsettingswidget.h +++ b/xsettingswidget.h @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by 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

x2gothinclient.git - build-main (branch) updated: 1.0.1.4
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, build-main has been updated via 247c0e307b5ef1ccb1a205e08aa7dd27f96e207f (commit) via 976b8fb9f1053d639186e3ad82584a989b869b10 (commit) via 772bfa86e94c4ce6b86850b776096895a9b27582 (commit) via 4138ea8a0316d05f0e42c7eccc5f12326c5d5279 (commit) via 18d185098ca54ba8cf3c8f7f672be08da0d51cf8 (commit) via ce640fbf1d3aad812b116f83b5991db24df8c20a (commit) via b142761be964562cebfa21b724f158928923cbfe (commit) from 5ae6b6661a327d11dfb0a86906ba72d0352bb283 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: README.howto | 6 ++-- VERSION | 2 +- debian/changelog | 26 +++++++++++----- debian/control | 32 ++++++++++---------- debian/copyright | 6 ++-- debian/x2gocdmanager.init | 6 ++-- debian/x2gothinclient.init | 8 ++-- x2gocdmanager/man/x2gocdmanager.8 | 8 ++-- x2gocdmanager/man/x2goejectcd.1 | 8 ++-- x2gocdmanager/powerej/eject.cpp | 2 +- x2gocdmanager/x2gocdmanager | 6 ++-- x2gosmartcardrules/man/x2gognupgccid.8 | 8 ++-- x2gothinclient/man/x2gothinclientd.8 | 8 ++-- x2gothinclient/sbin/x2gothinclientd | 6 ++-- .../etc/x2gothinclient_settings | 20 ++++++------ .../man/x2gothinclient_cleanup.8 | 8 ++-- .../man/x2gothinclient_create.8 | 10 +++--- .../man/x2gothinclient_preptftpboot.8 | 12 ++++---- .../man/x2gothinclient_shell.8 | 10 +++--- .../man/x2gothinclient_update.8 | 10 +++--- .../man/x2gothinclient_upgrade.8 | 8 ++-- .../sbin/x2gothinclient_cleanup | 16 +++++----- .../sbin/x2gothinclient_create | 17 +++++----- .../sbin/x2gothinclient_preptftpboot | 18 +++++----- x2gothinclientmanagement/sbin/x2gothinclient_shell | 18 +++++----- .../sbin/x2gothinclient_update | 14 ++++---- .../sbin/x2gothinclient_upgrade | 10 +++--- .../share/tftpboot/default.cfg | 4 +- .../share/tftpboot/x2go-tce.cfg | 4 +- x2gothinclientmanagement/share/x2gothinclient_init | 6 ++-- .../share/x2gothinclient_sessions | 2 +- .../share/x2gothinclient_start | 7 ++-- x2gothinshutdown/man/thinshutdown.1 | 8 ++-- x2gothinshutdown/thinshutdown/thinshutdown.cpp | 2 +- x2gousbmount/man/x2gousbmount.8 | 8 ++-- x2gousbmount/x2gousbmount | 6 ++-- 36 files changed, 181 insertions(+), 169 deletions(-) mode change 100755 => 100644 debian/rules mode change 100755 => 100644 x2gocdmanager/x2gocdmanager mode change 100755 => 100644 x2gosmartcardrules/x2gognupgccid mode change 100755 => 100644 x2gothinclient/sbin/x2gothinclientd mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_cleanup mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_create mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_shell mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_update mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_upgrade mode change 100755 => 100644 x2gothinclientmanagement/share/x2gothinclient_init mode change 100755 => 100644 x2gothinclientmanagement/share/x2gothinclient_start mode change 100755 => 100644 x2gousbmount/x2gousbmount The diff of changes is: diff --git a/README.howto b/README.howto index f2e8f43..66c1de7 100644 --- a/README.howto +++ b/README.howto @@ -26,7 +26,7 @@ Install TCE: $ echo x2gothinclient > /opt/x2gothinclient/etc/hostname $ echo "127.0.0.1 localhost" >> /opt/x2gothinclient/etc/hosts -Repeat these steps for any of your X2go servers: +Repeat these steps for any of your X2Go servers: <TODO: REVIEW/FIXME (use aptitude instead of apt-get)> $ echo "192.168.0.1 x2goserver" >> /opt/x2gothinclient/etc/hosts @@ -113,8 +113,8 @@ NFS (/etc/exports): X2go Server in LDAP ------------------- -Do not forget to store you X2go servers in LDAP. Use +Do not forget to store you X2Go servers in LDAP. Use $ ldap.addserver <name> <ip> -to add an X2go server to the LDAP tree. +to add an X2Go server to the LDAP tree. diff --git a/VERSION b/VERSION index ba6c0fc..04de192 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.3 +1.0.1.4 diff --git a/debian/changelog b/debian/changelog index 344f9b0..c7ec354 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,17 @@ -x2gothinclient (1.0.1.3-0~x2go1.1) unstable; urgency=low +x2gothinclient (1.0.1.4-0~x2go1) unstable; urgency=low + + * New upstream version (1.0.1.4): + - Fix default value for shell in x2gothinclient_shell script. + - Install alsa-base in X2Go TCE chroot and tmpfs mount /var/lib/alsa. + - Pre-select example session after X2Go thin client has booted. + - Rename every X2go string (in docs, screen output, etc.) to X2Go. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 15:15:09 +0100 + +x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - New upstream version (1.0.1.3): + * New upstream version (1.0.1.3): - Split up x2gocdmanager package into x2gocdmanager and x2gothinshutdown package - Fix USB mounting, CD mounting, @@ -9,15 +19,15 @@ x2gothinclient (1.0.1.3-0~x2go1.1) unstable; urgency=low - Add HTTP_PROXY and FTP_PROXY support to x2gothinclientmanagement (APT package download) - Add example files/symlinks for tftpboot environment. - - Add syslinux boot splash with X2go flavour. + - Add syslinux boot splash with X2Go flavour. - Install 486 and 686 kernels in TCE chroot. - Move PXE tftpboot examples to x2gothinclient/share/tftpboot. - Improval of syslinux boot screen. - Add x2gothinclient_preptftpboot script. - Add man page for x2gothinclient_preptftpboot. - - Do not run management script if there is a problem with the X2go TCE + - Do not run management script if there is a problem with the X2Go TCE chroot. - - Sanity checks: X2go TCE management script have to run as root. + - Sanity checks: X2Go TCE management script have to run as root. - Add HTTPS_PROXY support. - Add x2gothinclient_cleanup script. - Add man page for x2gothinclient_cleanup. @@ -26,7 +36,7 @@ x2gothinclient (1.0.1.3-0~x2go1.1) unstable; urgency=low - Fix udev rules path in x2gousbmount. - Add comment that names possible boot profiles to tftp config template. - Add kernel module blacklisting for x2gothinclient_create. - - Tweak mtab diversion on X2go Thin Client to avoid error messages. + - Tweak mtab diversion on X2Go Thin Client to avoid error messages. - Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. - Disable service restarts in chroot. - Add a ,,hit <RETURN> before TCE creation. @@ -50,11 +60,11 @@ x2gothinclient (1.0.1.3-0~x2go1.1) unstable; urgency=low * x2gothinshutdown: conflicts x2gocdmanager<=1.0.1.2. [ Coco ] - Improvements for upstream version (1.0.1.3): + * Improvements for upstream version (1.0.1.3): - Replace tmpfs mount on /etc/network/run with symlink /etc/network/run -> /dev/shm. [ Oleksandr Shneyder ] - Improvements for upstream version (1.0.1.3): + * Improvements for upstream version (1.0.1.3): - x2gosmartcardrules: support for SCM SCR331-LC1 SmartCard Reader. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 12:16:59 +0200 diff --git a/debian/control b/debian/control index a94fe08..4348bf8 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,8 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server -Description: Management tools for X2go thin client chroot server - X2go is a server based computing environment with +Description: Management tools for X2Go thin client chroot server + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -37,7 +37,7 @@ Description: Management tools for X2go thin client chroot server x2gothinclientmanagement: ------------------------- IMPORTANT: Install this package on the chroot server that - provides X2go thin client images over PXE/Etherboot. + provides X2Go thin client images over PXE/Etherboot. . For chroot servers we recommend a very separate machine (not your main server on your network) that only serves this purpose. @@ -62,7 +62,7 @@ Recommends: acpid, memtest86+ Description: login daemon starting x2goclient in displaymanager mode - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -72,15 +72,15 @@ Description: login daemon starting x2goclient in displaymanager mode . x2gothinclient: --------------- - IMPORTANT: Use this Package only for the X2go THIN CLIENT ENVIRONMENT + IMPORTANT: Use this Package only for the X2Go THIN CLIENT ENVIRONMENT (This package is meant to be installed in a CHROOT environment!!!) . This package starts x2goclient in fullscreen mode---without window decorations, without menu and toolbar and optionally with enabled LDAP support. The - package ships the core X2go thin client daemon that guards over + package ships the core X2Go thin client daemon that guards over x2goclient functionality. . - x2goclient will behave like xdm, kdm or gdm on X2go thin clients. + x2goclient will behave like xdm, kdm or gdm on X2Go thin clients. Package: x2gousbmount Architecture: all @@ -89,7 +89,7 @@ Depends: udev, cryptsetup Description: clientside usb mass-storage device mounting - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -103,7 +103,7 @@ Description: clientside usb mass-storage device mounting (This package is meant to be installed in a CHROOT environment!!!) . This package adds client-side USB mass storage device mounting using - UDEV rules to your X2go thin client. + UDEV rules to your X2Go thin client. Package: x2gocdmanager Architecture: any @@ -114,7 +114,7 @@ Depends: lsscsi, eject, Description: clientside daemon enabling automatic CD-Rom mounting - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -127,8 +127,8 @@ Description: clientside daemon enabling automatic CD-Rom mounting IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT (This package is meant to be installed in a CHROOT environment!!!) . - This package adds a client-side daemon to your X2go thin client that enables - automatic CD-ROM mounting within thin client X2go sessions. + This package adds a client-side daemon to your X2Go thin client that enables + automatic CD-ROM mounting within thin client X2Go sessions. Package: x2gothinshutdown Architecture: any @@ -138,8 +138,8 @@ Depends: libqt4-gui, Conflicts: x2gocdmanager (<= 1.0.1.2-0~) -Description: shutdown button for X2go thin client - X2go is a server based computing environment with +Description: shutdown button for X2Go thin client + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -153,7 +153,7 @@ Description: shutdown button for X2go thin client (This package is meant to be installed in a CHROOT environment!!!) . This package provides an on-screen power-off button (Qt4) for shutting - down your X2go thin client. + down your X2Go thin client. Package: x2gosmartcardrules Architecture: all @@ -161,7 +161,7 @@ Depends: ${misc:Depends}, udev Description: UDEV rules for smartcard readers - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support diff --git a/debian/copyright b/debian/copyright index d3e1836..1c53057 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Copyright (C) 2007-2011 X2go project / obviously nice - http://wiki.x2go.org +Copyright (C) 2007-2012 X2Go project / obviously nice - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,14 +31,14 @@ Copyright (C) 2007-2010 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -Copyright (C) 2010-2011 +Copyright (C) 2010-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> -The Debian packaging is (C) 2007-2011, +The Debian packaging is (C) 2007-2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init index d222cce..a7d6e8a 100644 --- a/debian/x2gocdmanager.init +++ b/debian/x2gocdmanager.init @@ -1,16 +1,16 @@ #! /bin/sh -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 9b305a5..7035ca8 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -1,16 +1,16 @@ #! /bin/sh -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -38,7 +38,7 @@ DESC=x2gothinclient test -x $DAEMON || exit 0 test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; } -# pre-init X2go Thin Client through init script... +# pre-init X2Go Thin Client through init script... test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init set -e diff --git a/x2gocdmanager/man/x2gocdmanager.8 b/x2gocdmanager/man/x2gocdmanager.8 index 3caafc6..ccbcb8d 100644 --- a/x2gocdmanager/man/x2gocdmanager.8 +++ b/x2gocdmanager/man/x2gocdmanager.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocdmanager 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gocdmanager 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gocdmanager \- CD/DVD Management Daemon running on X2go Thin Clients. +x2gocdmanager \- CD/DVD Management Daemon running on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gocdmanager \- CD/DVD Management Daemon running on X2go Thin Clients. \fBx2gocdmanager\fR .SH DESCRIPTION -\fBx2gocdmanager\fR is a CD/DVD management daemon that runs on X2go thin clients. +\fBx2gocdmanager\fR is a CD/DVD management daemon that runs on X2Go thin clients. .PP .SH OPTIONS \fBx2gocdmanager\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gocdmanager/man/x2goejectcd.1 b/x2gocdmanager/man/x2goejectcd.1 index 359fbd3..db534bf 100644 --- a/x2gocdmanager/man/x2goejectcd.1 +++ b/x2gocdmanager/man/x2goejectcd.1 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goejectcd 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2goejectcd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2goejectcd \- CD/DVD bay eject tool for X2go Thin Clients. +x2goejectcd \- CD/DVD bay eject tool for X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2goejectcd \- CD/DVD bay eject tool for X2go Thin Clients. \fBx2goejectcd\fR .SH DESCRIPTION -\fBx2goejectcd\fR is used to eject the CD/DVD bay of optical discs built into X2go thin clients. +\fBx2goejectcd\fR is used to eject the CD/DVD bay of optical discs built into X2Go thin clients. .PP .SH OPTIONS \fBx2goejectcd\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gocdmanager/powerej/eject.cpp b/x2gocdmanager/powerej/eject.cpp index 6870cb0..0ee9b9a 100644 --- a/x2gocdmanager/powerej/eject.cpp +++ b/x2gocdmanager/powerej/eject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2011 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/x2gocdmanager/x2gocdmanager b/x2gocdmanager/x2gocdmanager old mode 100755 new mode 100644 index 1e64a31..e07a599 --- a/x2gocdmanager/x2gocdmanager +++ b/x2gocdmanager/x2gocdmanager @@ -1,14 +1,14 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/x2gosmartcardrules/man/x2gognupgccid.8 b/x2gosmartcardrules/man/x2gognupgccid.8 index 881b811..01e0f6b 100644 --- a/x2gosmartcardrules/man/x2gognupgccid.8 +++ b/x2gosmartcardrules/man/x2gognupgccid.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gognupgccid 8 "16 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gognupgccid 8 "16 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gognupgccid \- udev Script handling GnuPG smart card readers on X2go Thin Clients. +x2gognupgccid \- udev Script handling GnuPG smart card readers on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gognupgccid \- udev Script handling GnuPG smart card readers on X2go Thin Clie x2gognupgccid .SH DESCRIPTION -\fBx2gognupgccid\fR is a udev script that handles the usage of GnuPG smart card readers that are connected to X2go Thin Clients. +\fBx2gognupgccid\fR is a udev script that handles the usage of GnuPG smart card readers that are connected to X2Go Thin Clients. .PP .SH OPTIONS \fBx2gognupgccid\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gosmartcardrules/x2gognupgccid b/x2gosmartcardrules/x2gognupgccid old mode 100755 new mode 100644 diff --git a/x2gothinclient/man/x2gothinclientd.8 b/x2gothinclient/man/x2gothinclientd.8 index 2003f80..2fc2317 100644 --- a/x2gothinclient/man/x2gothinclientd.8 +++ b/x2gothinclient/man/x2gothinclientd.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclientd 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclientd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclientd \- Session Control Daemon running on X2go Thin Clients. +x2gothinclientd \- Session Control Daemon running on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gothinclientd \- Session Control Daemon running on X2go Thin Clients. \fBx2gothinclientd\fR .SH DESCRIPTION -\fBx2gothinclientd\fR is a session control daemon that runs on X2go thin clients. +\fBx2gothinclientd\fR is a session control daemon that runs on X2Go thin clients. .PP .SH OPTIONS \fBx2gothinclientd\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd old mode 100755 new mode 100644 index 9efdb7d..a7f4af0 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -1,14 +1,14 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index 4ed1521..283a62d 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -1,14 +1,14 @@ -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -18,22 +18,22 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# base path for X2go thin client files +# base path for X2Go thin client files TC_BASE="/opt/x2gothinclient" -# path to X2go thin client chroot +# path to X2Go thin client chroot TC_CHROOT="$TC_BASE/chroot" -# path to the X2go thin client configuration +# path to the X2Go thin client configuration TC_CONFIG="$TC_BASE/etc" -# shell to use when maintaining X2go thin client chroot manually +# shell to use when maintaining X2Go thin client chroot manually TC_SHELL="bash" # Debian package mirror to use... TC_DEBMIRROR_URL="http://ftp.debian.org/debian" -# Retrieve X2go packages from this URL +# Retrieve X2Go packages from this URL TC_X2GO_DEBURL="deb http://packages.x2go.org/debian stable main" # Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed) @@ -44,7 +44,7 @@ TC_HTTP_PROXY="" TC_HTTPS_PROXY="" TC_FTP_PROXY="" -# module blacklist (used during X2go TCE creation) +# module blacklist (used during X2Go TCE creation) TC_MODULE_BLACKLIST="pcspkr" # tftp boot environment (PXE/syslinux files delivered via tftpd) @@ -53,7 +53,7 @@ TC_TFTP_BOOT="/srv/tftp" echo echo "X2go Thin Client Environment:" echo "=============================" -echo "The X2go Thin Client Environment is using the following" +echo "The X2Go Thin Client Environment is using the following" echo "settings:" echo echo "TC_BASE=$TC_BASE" diff --git a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 index 47ae00c..fdec84e 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_cleanup 8 "15 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_cleanup 8 "15 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclient_cleanup \- Removes the X2go Thin Client environment from the X2go PXE server. +x2gothinclient_cleanup \- Removes the X2Go Thin Client environment from the X2Go PXE server. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2gothinclient_cleanup \- Removes the X2go Thin Client environment from the X2go \fBx2gothinclient_cleanup\fR .SH DESCRIPTION -This helper script removes the complete X2go TCE from your system. The script will +This helper script removes the complete X2Go TCE from your system. The script will ask you to confirm the removal action. Use with care!!! @@ -29,5 +29,5 @@ Use with care!!! .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclientmanagement/man/x2gothinclient_create.8 b/x2gothinclientmanagement/man/x2gothinclient_create.8 index da8cb54..b046fcd 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_create.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_create.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_create 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_create 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclient_create \- Creates X2go Thin Client chroot Environment. +x2gothinclient_create \- Creates X2Go Thin Client chroot Environment. .SH SYNOPSIS 'nh .fi @@ -15,10 +15,10 @@ x2gothinclient_create \- Creates X2go Thin Client chroot Environment. \fBx2gothinclient_create\fR .SH DESCRIPTION -This helper script creates a bootable X2go thin client system in a chroot environment. +This helper script creates a bootable X2Go thin client system in a chroot environment. .PP \fBNOTE:\fR Use this script for -building your own X2go TCE. Run this script on your X2go TCE PXE/Etherboot server (as in your DHCP +building your own X2Go TCE. Run this script on your X2Go TCE PXE/Etherboot server (as in your DHCP server's ''next-server'' option). .PP We highly recommend using a separate server (or virtual machine) for providing chroot environments. @@ -31,5 +31,5 @@ We highly recommend using a separate server (or virtual machine) for providing c Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 index 44b8e3f..67ea38d 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2go PXE Server. +x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2Go PXE Server. .SH SYNOPSIS 'nh .fi @@ -15,8 +15,8 @@ x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered \fBx2gothinclient_preptftpboot\fR .SH DESCRIPTION -This helper script prepares X2go's PXE/Syslinux boot environment. As X2go PXE -server you can either use your X2go server itself or a dedicated machine or VM that merely serves +This helper script prepares X2Go's PXE/Syslinux boot environment. As X2Go PXE +server you can either use your X2Go server itself or a dedicated machine or VM that merely serves as PXE boot server. .PP Please run the \fBx2gothinclient_create\fR helper script first before you run this script. @@ -33,7 +33,7 @@ obtained from \fI/etc/x2go/x2gothinclient_settings\fR. next-server <IP-or-hostname-of-this-server>; filename '/pxelinux.0'; .PP - 2. Export the X2go Thin Client chroot environment via NFSv3: + 2. Export the X2Go Thin Client chroot environment via NFSv3: .PP Add this line to /etc/exports... (in one line): .PP @@ -60,5 +60,5 @@ obtained from \fI/etc/x2go/x2gothinclient_settings\fR. Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclientmanagement/man/x2gothinclient_shell.8 b/x2gothinclientmanagement/man/x2gothinclient_shell.8 index 0910bd9..f98fefe 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_shell.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_shell.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_shell 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_shell 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclient_shell \- Opens a shell within the X2go Thin Client chroot Environment. +x2gothinclient_shell \- Opens a shell within the X2Go Thin Client chroot Environment. .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2gothinclient_shell \- Opens a shell within the X2go Thin Client chroot Environ \fBx2gothinclient_shell\fR .SH DESCRIPTION -This helper script opens a shell within the X2go thin client chroot environment. +This helper script opens a shell within the X2Go thin client chroot environment. .PP -\fBNOTE:\fR Use this script to perform maintenance work within your X2go thin client chroot. +\fBNOTE:\fR Use this script to perform maintenance work within your X2Go thin client chroot. .PP .SH OPTIONS \fBx2gothinclient_shell\fR has no known options. @@ -27,5 +27,5 @@ This helper script opens a shell within the X2go thin client chroot environment. Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclientmanagement/man/x2gothinclient_update.8 b/x2gothinclientmanagement/man/x2gothinclient_update.8 index 234befb..6328e65 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_update.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_update.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_update 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_update 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclient_update \- Updates the X2go Thin Client configuration. +x2gothinclient_update \- Updates the X2Go Thin Client configuration. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2gothinclient_update \- Updates the X2go Thin Client configuration. \fBx2gothinclient_update\fR .SH DESCRIPTION -This helper script updates the configuration of an X2go thin client chroot environment (x2goclient startup, non-LDAP session profiles). +This helper script updates the configuration of an X2Go thin client chroot environment (x2goclient startup, non-LDAP session profiles). .PP .SH OPTIONS \fBx2gothinclient_update\fR has no known options. @@ -25,7 +25,7 @@ This helper script updates the configuration of an X2go thin client chroot envir Configuration file for x2gothinclient_* scripts. /usr/share/x2go/tce/x2gothinclient_init - Script that prepares tmpfs filespace on X2go thin client startup. + Script that prepares tmpfs filespace on X2Go thin client startup. /usr/share/x2go/tce/x2gothinclient_start Script that launches and configures x2goclient in desktop manager @@ -35,5 +35,5 @@ This helper script updates the configuration of an X2go thin client chroot envir Session profiles for x2goclient if running in non-LDAP mode. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 index ce7f42d..2caf9a2 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_upgrade 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_upgrade 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gothinclient_upgrade \- Upgrade the X2go Thin Client's software. +x2gothinclient_upgrade \- Upgrade the X2Go Thin Client's software. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2gothinclient_upgrade \- Upgrade the X2go Thin Client's software. \fBx2gothinclient_upgrade\fR .SH DESCRIPTION -This helper script performs a package upgrade within the X2go thin client chroot. Use this script to update/upgrade your +This helper script performs a package upgrade within the X2Go thin client chroot. Use this script to update/upgrade your X2go thin client's software. .PP .SH OPTIONS @@ -26,5 +26,5 @@ X2go thin client's software. Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup old mode 100755 new mode 100644 index 566db5e..98855fd --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -38,14 +38,14 @@ TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}" [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } echo "X2go TCE cleanup..." echo "-------------------" -echo "Hit <RETURN> to purge all X2go TCE related files (chroot, TCE config, PXE boot env)..." +echo "Hit <RETURN> to purge all X2Go TCE related files (chroot, TCE config, PXE boot env)..." echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -54,13 +54,13 @@ test -e "$TC_CHROOT" && { echo "Removing $TC_CHROOT..." rm -Rf "${TC_CHROOT}" } || { - echo "WARNING: X2go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..." + echo "WARNING: X2Go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..." } test -e "$TC_CONFIG" && { echo "Removing $TC_CONFIG..." rm -Rf "${TC_CONFIG}" } || { - echo "WARNING: X2go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..." + echo "WARNING: X2Go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..." } ### PXE/Syslinux @@ -68,7 +68,7 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { echo "Emptying $TC_TFTP_BOOT..." rm -Rf "${TC_TFTP_BOOT}"/* } || { - echo "WARNING: X2go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..." + echo "WARNING: X2Go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..." } echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create old mode 100755 new mode 100644 index c5bf7e7..e0da318 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -43,17 +43,17 @@ TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org stable main'}" TC_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}" test -e "$TC_CHROOT" && { - echo "ERROR: X2go Thin Client chroot already exists at $TC_CHROOT." + echo "ERROR: X2Go Thin Client chroot already exists at $TC_CHROOT." echo "Clear $TC_BASE/ and then run $(basename $0) again..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } -echo "Hit <RETURN> to continue with X2go TCE chroot creation using the above TCE parameters..." +echo "Hit <RETURN> to continue with X2Go TCE chroot creation using the above TCE parameters..." echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -92,6 +92,7 @@ none /media tmpfs size=50M 0 0 none /var/lib/nfs tmpfs size=50M 0 0 none /var/lib/xkb tmpfs size=50M 0 0 none /var/lib/dbus tmpfs size=50M 0 0 +none /var/lib/alsa tmpfs size=50M 0 0 EOF @@ -135,11 +136,11 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules -[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2go Thin Clients..." >> /etc/modprobe.d/blacklist.conf +[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf [ \$? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist \$mod" >> /etc/modprobe.d/blacklist.conf; done # Pulsaudio must come afterwards until the thinclient-package is fixed -[ \$? -eq 0 ] && apt-get install pulseaudio -y +[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y [ \$? -eq 0 ] && apt-get install patch -y [ \$? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH 39c39 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot old mode 100755 new mode 100644 index 5b64d70..a011f8b --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -49,19 +49,19 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } -echo "Preparing PXE boot configuration for X2go TCE..." +echo "Preparing PXE boot configuration for X2Go TCE..." echo "------------------------------------------------" echo -echo "Copying X2go's TFTP (syslinux) template files..." +echo "Copying X2Go's TFTP (syslinux) template files..." cp -av "$TC_TFTP_FILES"/* "$TC_TFTP_BOOT" echo -echo "Linking files for X2go's TFTP (syslinux) boot environment..." +echo "Linking files for X2Go's TFTP (syslinux) boot environment..." cd "$TC_TFTP_BOOT" # 486 kernel image @@ -79,7 +79,7 @@ ln -sfv "/usr/lib/syslinux/vesamenu.c32" "$TC_TFTP_BOOT/vesamenu.c32" cd - > /dev/null echo -echo "DONE with X2go PXE/Syslinux environment setup." +echo "DONE with X2Go PXE/Syslinux environment setup." echo "However, 2-3 manual steps are still needed..." echo @@ -88,7 +88,7 @@ echo echo " next-server <IP-or-hostname-of-this-server>;" echo " filename '/pxelinux.0';" echo -echo "2. Export the X2go Thin Client chroot environment via NFSv3:" +echo "2. Export the X2Go Thin Client chroot environment via NFSv3:" echo echo " Add this line to /etc/exports..." echo " $TC_CHROOT <your-network>/<netmask>(ro,async,no_root_squash,no_subtree_check)" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell old mode 100755 new mode 100644 index 2712320..625bb16 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -32,17 +32,17 @@ fi source $ETCDIR/x2gothinclient_settings -TC_SHELL="${TC_SHELL:-/bin/bash}" +TC_SHELL="${TC_SHELL:-bash}" TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT." echo "Run x2gothinclient_create to create it..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } @@ -57,14 +57,14 @@ export http_proxy=$TC_HTTP_PROXY export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY -echo 'This shell has been started in your X2go Thin Clients chroot environment.' -echo 'All changes performed here will take effect on your X2go Thin Clients' +echo 'This shell has been started in your X2Go Thin Clients chroot environment.' +echo 'All changes performed here will take effect on your X2Go Thin Clients' echo 'after their next (re)boot. So be careful!!!' echo echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the" echo 'command line...' echo -echo 'Note: Service restarts have been disabled in X2go TCE chroot.' +echo 'Note: Service restarts have been disabled in X2Go TCE chroot.' echo # disable service restarts diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update old mode 100755 new mode 100644 index 9c0d9f7..4a83145 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -37,24 +37,24 @@ TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}" TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT." echo "Run x2gothinclient_create to create it..." exit -1 } test -e "$TC_CONFIG" || { - echo "ERROR: No X2go Thin Client configuration found at $TC_CONFIG. Please check..." + echo "ERROR: No X2Go Thin Client configuration found at $TC_CONFIG. Please check..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } mkdir -p "$TC_CHROOT/etc/x2go" -echo "Installing X2go TCE configuration into chroot environment..." +echo "Installing X2Go TCE configuration into chroot environment..." echo "------------------------------------------------------------" cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade old mode 100755 new mode 100644 index 2d01390..a206837 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -35,13 +35,13 @@ source $ETCDIR/x2gothinclient_settings TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT." echo "Run x2gothinclient_create to create it..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg index 367b76e..33bac2b 100644 --- a/x2gothinclientmanagement/share/tftpboot/default.cfg +++ b/x2gothinclientmanagement/share/tftpboot/default.cfg @@ -1,11 +1,11 @@ # -# example for a main boot menu of an X2go Thin Client +# example for a main boot menu of an X2Go Thin Client # DEFAULT vesamenu.c32 PROMPT 0 MENU BACKGROUND x2go-splash.png -MENU TITLE X2go Thin Client Environment +MENU TITLE X2Go Thin Client Environment include local-boot.cfg include x2go-tce.cfg diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg index 4bec362..9d38f11 100644 --- a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg +++ b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg @@ -1,8 +1,8 @@ LABEL x2go-tce-686 - MENU LABEL X2go ^Thin Client + MENU LABEL X2Go ^Thin Client KERNEL vmlinuz.686 APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset LABEL x2go-tce-486 - MENU LABEL X2go ^Thin Client (old hardware) + MENU LABEL X2Go ^Thin Client (old hardware) KERNEL vmlinuz.486 APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset diff --git a/x2gothinclientmanagement/share/x2gothinclient_init b/x2gothinclientmanagement/share/x2gothinclient_init old mode 100755 new mode 100644 index 22093ca..60a1b23 --- a/x2gothinclientmanagement/share/x2gothinclient_init +++ b/x2gothinclientmanagement/share/x2gothinclient_init @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/x2gothinclientmanagement/share/x2gothinclient_sessions b/x2gothinclientmanagement/share/x2gothinclient_sessions index a294e0e..509bc9d 100644 --- a/x2gothinclientmanagement/share/x2gothinclient_sessions +++ b/x2gothinclientmanagement/share/x2gothinclient_sessions @@ -27,7 +27,7 @@ startsoundsystem = false icon = sound = true rootless = false -name = X2go.EXAMPLE +name = X2Go.EXAMPLE iconvto = UTF-8 rdpserver = useexports = true diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start old mode 100755 new mode 100644 index 68c4a05..d006485 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -29,6 +29,7 @@ --geometry=fullscreen \ --read-exports-from=/home/x2goclient/export \ --no-session-edit \ + --session=X2Go.Example \ --add-to-known-hosts & # for use with LDAP on Skolelinux network diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 index de03574..ead3d4a 100644 --- a/x2gothinshutdown/man/thinshutdown.1 +++ b/x2gothinshutdown/man/thinshutdown.1 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH thinshutdown 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -thinshutdown \- Shutdown tool for X2go Thin Clients. +thinshutdown \- Shutdown tool for X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ thinshutdown \- Shutdown tool for X2go Thin Clients. \fBthinshutdown\fR .SH DESCRIPTION -\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2go thin clients. +\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients. .PP .SH OPTIONS \fBthinshutdown\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp index 24722ce..796adad 100644 --- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp +++ b/x2gothinshutdown/thinshutdown/thinshutdown.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2011 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/x2gousbmount/man/x2gousbmount.8 b/x2gousbmount/man/x2gousbmount.8 index c4b636f..ede1cfe 100644 --- a/x2gousbmount/man/x2gousbmount.8 +++ b/x2gousbmount/man/x2gousbmount.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gousbmount 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gousbmount 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME -x2gousbmount \- udev Script handling USB Flash Drives on X2go Thin Clients. +x2gousbmount \- udev Script handling USB Flash Drives on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gousbmount \- udev Script handling USB Flash Drives on X2go Thin Clients. \fBx2gousbmount\fR .SH DESCRIPTION -\fBx2gousbmount\fR is a udev script that handles plugging of USB flash drives into X2go thin clients. +\fBx2gousbmount\fR is a udev script that handles plugging of USB flash drives into X2Go thin clients. .PP .SH OPTIONS \fBx2gousbmount\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount old mode 100755 new mode 100644 index b912027..a90da7f --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -1,14 +1,14 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.3-7-g247c0e3
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 247c0e307b5ef1ccb1a205e08aa7dd27f96e207f (commit) from 976b8fb9f1053d639186e3ad82584a989b869b10 (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 247c0e307b5ef1ccb1a205e08aa7dd27f96e207f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:15:48 2012 +0100 release 1.0.1.4 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 10fad12..c7ec354 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gothinclient (1.0.1.4-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.0.1.4-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.4): - Fix default value for shell in x2gothinclient_shell script. @@ -6,7 +6,7 @@ x2gothinclient (1.0.1.4-0~x2go1) UNRELEASED; urgency=low - Pre-select example session after X2Go thin client has booted. - Rename every X2go string (in docs, screen output, etc.) to X2Go. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 01:45:23 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 15:15:09 +0100 x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.3-6-g976b8fb
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 976b8fb9f1053d639186e3ad82584a989b869b10 (commit) from 772bfa86e94c4ce6b86850b776096895a9b27582 (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 976b8fb9f1053d639186e3ad82584a989b869b10 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:14:11 2012 +0100 happy new year, add release tag to man pages ----------------------------------------------------------------------- Summary of changes: debian/copyright | 6 +++--- debian/x2gocdmanager.init | 2 +- debian/x2gothinclient.init | 2 +- x2gocdmanager/man/x2gocdmanager.8 | 2 +- x2gocdmanager/man/x2goejectcd.1 | 2 +- x2gocdmanager/powerej/eject.cpp | 2 +- x2gocdmanager/x2gocdmanager | 2 +- x2gosmartcardrules/man/x2gognupgccid.8 | 2 +- x2gothinclient/man/x2gothinclientd.8 | 2 +- x2gothinclient/sbin/x2gothinclientd | 2 +- .../etc/x2gothinclient_settings | 2 +- .../man/x2gothinclient_cleanup.8 | 2 +- .../man/x2gothinclient_create.8 | 2 +- .../man/x2gothinclient_preptftpboot.8 | 2 +- .../man/x2gothinclient_shell.8 | 2 +- .../man/x2gothinclient_update.8 | 2 +- .../man/x2gothinclient_upgrade.8 | 2 +- .../sbin/x2gothinclient_cleanup | 2 +- .../sbin/x2gothinclient_create | 2 +- .../sbin/x2gothinclient_preptftpboot | 2 +- x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- .../sbin/x2gothinclient_update | 2 +- .../sbin/x2gothinclient_upgrade | 2 +- x2gothinclientmanagement/share/x2gothinclient_init | 2 +- .../share/x2gothinclient_start | 2 +- x2gothinshutdown/man/thinshutdown.1 | 2 +- x2gothinshutdown/thinshutdown/thinshutdown.cpp | 2 +- x2gousbmount/man/x2gousbmount.8 | 2 +- x2gousbmount/x2gousbmount | 2 +- 29 files changed, 31 insertions(+), 31 deletions(-) The diff of changes is: diff --git a/debian/copyright b/debian/copyright index 9c08883..1c53057 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Copyright (C) 2007-2011 X2Go project / obviously nice - http://wiki.x2go.org +Copyright (C) 2007-2012 X2Go project / obviously nice - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,14 +31,14 @@ Copyright (C) 2007-2010 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -Copyright (C) 2010-2011 +Copyright (C) 2010-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> -The Debian packaging is (C) 2007-2011, +The Debian packaging is (C) 2007-2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init index 7857938..a7d6e8a 100644 --- a/debian/x2gocdmanager.init +++ b/debian/x2gocdmanager.init @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 8f22ecb..7035ca8 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gocdmanager/man/x2gocdmanager.8 b/x2gocdmanager/man/x2gocdmanager.8 index 3f2c237..ccbcb8d 100644 --- a/x2gocdmanager/man/x2gocdmanager.8 +++ b/x2gocdmanager/man/x2gocdmanager.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocdmanager 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gocdmanager 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gocdmanager \- CD/DVD Management Daemon running on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gocdmanager/man/x2goejectcd.1 b/x2gocdmanager/man/x2goejectcd.1 index 660fb85..db534bf 100644 --- a/x2gocdmanager/man/x2goejectcd.1 +++ b/x2gocdmanager/man/x2goejectcd.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goejectcd 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2goejectcd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2goejectcd \- CD/DVD bay eject tool for X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gocdmanager/powerej/eject.cpp b/x2gocdmanager/powerej/eject.cpp index 6870cb0..0ee9b9a 100644 --- a/x2gocdmanager/powerej/eject.cpp +++ b/x2gocdmanager/powerej/eject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2011 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/x2gocdmanager/x2gocdmanager b/x2gocdmanager/x2gocdmanager index e7894c4..e07a599 100644 --- a/x2gocdmanager/x2gocdmanager +++ b/x2gocdmanager/x2gocdmanager @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # X2Go is free software; you can redistribute it and/or modify diff --git a/x2gosmartcardrules/man/x2gognupgccid.8 b/x2gosmartcardrules/man/x2gognupgccid.8 index 9ca2c70..01e0f6b 100644 --- a/x2gosmartcardrules/man/x2gognupgccid.8 +++ b/x2gosmartcardrules/man/x2gognupgccid.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gognupgccid 8 "16 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gognupgccid 8 "16 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gognupgccid \- udev Script handling GnuPG smart card readers on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinclient/man/x2gothinclientd.8 b/x2gothinclient/man/x2gothinclientd.8 index fbb510e..2fc2317 100644 --- a/x2gothinclient/man/x2gothinclientd.8 +++ b/x2gothinclient/man/x2gothinclientd.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclientd 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclientd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclientd \- Session Control Daemon running on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 2166ed6..a7f4af0 100644 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # X2Go is free software; you can redistribute it and/or modify diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index 2163e62..283a62d 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 index 5ca98ed..fdec84e 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_cleanup 8 "15 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_cleanup 8 "15 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_cleanup \- Removes the X2Go Thin Client environment from the X2Go PXE server. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_create.8 b/x2gothinclientmanagement/man/x2gothinclient_create.8 index b83dd0d..b046fcd 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_create.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_create.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_create 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_create 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_create \- Creates X2Go Thin Client chroot Environment. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 index 3a33d5f..67ea38d 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2Go PXE Server. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_shell.8 b/x2gothinclientmanagement/man/x2gothinclient_shell.8 index cd2c201..f98fefe 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_shell.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_shell.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_shell 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_shell 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_shell \- Opens a shell within the X2Go Thin Client chroot Environment. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_update.8 b/x2gothinclientmanagement/man/x2gothinclient_update.8 index 5a754fc..6328e65 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_update.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_update.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_update 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_update 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_update \- Updates the X2Go Thin Client configuration. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 index 8ac702e..2caf9a2 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_upgrade 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_upgrade 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_upgrade \- Upgrade the X2Go Thin Client's software. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup index ec838e7..98855fd 100644 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 63b03e0..e0da318 100644 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot index c933c1d..a011f8b 100644 --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 4b8b938..625bb16 100644 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index b6d80bf..4a83145 100644 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 3d24b9e..a206837 100644 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/share/x2gothinclient_init b/x2gothinclientmanagement/share/x2gothinclient_init index 0b68f7e..60a1b23 100644 --- a/x2gothinclientmanagement/share/x2gothinclient_init +++ b/x2gothinclientmanagement/share/x2gothinclient_init @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index ae55df6..d006485 100644 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 index 9cacd85..ead3d4a 100644 --- a/x2gothinshutdown/man/thinshutdown.1 +++ b/x2gothinshutdown/man/thinshutdown.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH thinshutdown 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME thinshutdown \- Shutdown tool for X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp index 24722ce..796adad 100644 --- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp +++ b/x2gothinshutdown/thinshutdown/thinshutdown.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2011 by Oleksandr Shneyder * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/x2gousbmount/man/x2gousbmount.8 b/x2gousbmount/man/x2gousbmount.8 index 4f91e0b..ede1cfe 100644 --- a/x2gousbmount/man/x2gousbmount.8 +++ b/x2gousbmount/man/x2gousbmount.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gousbmount 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gousbmount 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" .SH NAME x2gousbmount \- udev Script handling USB Flash Drives on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index bb8a826..a90da7f 100644 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2Go project, http://wiki.x2go.org +# Copyright (C) 2007-2012 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # X2Go is free software; you can redistribute it and/or modify hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2goserver.git - master (branch) updated: 3.0.99.9-4-g835a18e
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 835a18eeaca0e45002ad04ca0107de49fd268ad5 (commit) from 46a20a6b158b09a1f23f967063f7da2202fb2c8b (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 835a18eeaca0e45002ad04ca0107de49fd268ad5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:09:34 2012 +0100 happy new year ----------------------------------------------------------------------- Summary of changes: debian/copyright | 8 ++++---- x2goserver-compat/bin/x2gosuspend | 6 +++--- x2goserver-compat/bin/x2gosuspend-agent | 6 +++--- x2goserver-compat/bin/x2goterminate | 6 +++--- .../share/x2gofeature.d/x2goserver-compat.features | 6 +++--- .../bin/x2goserver-run-extensions | 8 ++++---- .../x2gofeature.d/x2goserver-extensions.features | 6 +++--- x2goserver-printing/bin/x2goprint | 6 +++--- .../x2gofeature.d/x2goserver-printing.features | 6 +++--- x2goserver-pyhoca/bin/x2gosetkeyboard | 6 +++--- .../share/x2gofeature.d/x2goserver-pyhoca.features | 6 +++--- .../x2gofeature.d/x2goserver-xsession.features | 6 +++--- x2goserver/bin/x2gobasepath | 4 ++-- x2goserver/bin/x2gocmdexitmessage | 6 +++--- x2goserver/bin/x2gofeature | 6 +++--- x2goserver/bin/x2gogetservers | 6 +++--- x2goserver/bin/x2golistdesktops | 6 +++--- x2goserver/bin/x2golistmounts | 6 +++--- x2goserver/bin/x2golistsessions | 6 +++--- x2goserver/bin/x2gomountdirs | 6 +++--- x2goserver/bin/x2goresume-session | 6 +++--- x2goserver/bin/x2goruncommand | 6 +++--- x2goserver/bin/x2gosessionlimit | 6 +++--- x2goserver/bin/x2goshowblocks | 6 +++--- x2goserver/bin/x2gostartagent | 6 +++--- x2goserver/bin/x2gosuspend-session | 6 +++--- x2goserver/bin/x2goterminate-session | 6 +++--- x2goserver/bin/x2goumount-session | 6 +++--- x2goserver/bin/x2goversion | 6 +++--- x2goserver/lib/x2gochangestatus | 6 +++--- x2goserver/lib/x2gocreatesession | 6 +++--- x2goserver/lib/x2godbwrapper.pm | 6 +++--- x2goserver/lib/x2gogetagent | 6 +++--- x2goserver/lib/x2gogetdisplays | 6 +++--- x2goserver/lib/x2gogetports | 6 +++--- x2goserver/lib/x2goinsertport | 6 +++--- x2goserver/lib/x2goinsertsession | 6 +++--- x2goserver/lib/x2golistsessions_sql | 6 +++--- x2goserver/lib/x2gologlevel | 6 +++--- x2goserver/lib/x2gologlevel.pm | 6 +++--- x2goserver/lib/x2goresume | 6 +++--- x2goserver/lib/x2gosqlitewrapper.pl | 6 +++--- x2goserver/lib/x2gosuspend-agent | 6 +++--- x2goserver/lib/x2gosyslog | 6 +++--- x2goserver/sbin/x2gocleansessions | 6 +++--- x2goserver/sbin/x2godbadmin | 6 +++--- x2goserver/sbin/x2golistsessions_root | 6 +++--- x2goserver/share/x2gofeature.d/x2goserver.features | 6 +++--- x2goserver/x2gosqlitewrapper.c | 4 ++-- 49 files changed, 147 insertions(+), 147 deletions(-) The diff of changes is: diff --git a/debian/copyright b/debian/copyright index ad32b1a..92c339a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-M. Graesing <heinz-m.graesing(a)obviously-nice.de> -Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -Copyright (C) 2007-2011 Oleksandr Shneyder +Copyright (C) 2007-2012 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de -Copyright (C) 2007-2011 Heinz-Markus Graesing +Copyright (C) 2007-2012 Heinz-Markus Graesing heinz-m.graesing(a)obviously-nice.de Upstream contributors to x2goserver-extensions: @@ -35,5 +35,5 @@ Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2007-2011, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and +The Debian packaging is (C) 2007-2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and is licensed under the GPL, see above. diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend index 8dd489c..a525624 100755 --- a/x2goserver-compat/bin/x2gosuspend +++ b/x2goserver-compat/bin/x2gosuspend @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> # this script is here for reasons of backwards compatibility with older clients x2gosuspend-session $@ \ No newline at end of file diff --git a/x2goserver-compat/bin/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent index 90d3973..2ae4edc 100755 --- a/x2goserver-compat/bin/x2gosuspend-agent +++ b/x2goserver-compat/bin/x2gosuspend-agent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> shift; shift; diff --git a/x2goserver-compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate index 7f6fcba..57ca2a5 100755 --- a/x2goserver-compat/bin/x2goterminate +++ b/x2goserver-compat/bin/x2goterminate @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; my $proc=shift; diff --git a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features index 5f3f5b0..d180d95 100755 --- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features +++ b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 2cb3c4d..3df2066 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,9 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> set -e diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 23167f8..2a21cad 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index b53c373..113e5f6 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use File::Basename; diff --git a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features index 8b0be89..eb64533 100755 --- a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features +++ b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard index 6b00e88..26a50f8 100755 --- a/x2goserver-pyhoca/bin/x2gosetkeyboard +++ b/x2goserver-pyhoca/bin/x2gosetkeyboard @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> set -e diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features index e9a3080..1737ad8 100755 --- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features +++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features index 4850483..cc20f85 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver/bin/x2gobasepath b/x2goserver/bin/x2gobasepath index 7a1adf1..35f18bd 100755 --- a/x2goserver/bin/x2gobasepath +++ b/x2goserver/bin/x2gobasepath @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2007-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> use strict; use Cwd; diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index f5b9fab..a8e122b 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_ROOT=${HOME}/.x2go diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index adf85e6..997418e 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> [ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index da7d048..d34cc98 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 814e0a9..acdd7c4 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 4a7671f..ade0c67 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 847355e..e4421b3 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index e1cdd5e..0d52a7b 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 95aae49..9023e86 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index bb08016..99be494 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> DISPLAY=":$1" X2GO_AGENT_PID=$2 diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index a32b6eb..0287fc4 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Config::Simple; diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index 3b8171a..f253a73 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index a5a4310..e882fdd 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index df276b6..b9eeb7f 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> if [ $# -eq 1 ]; then SESSION_NAME=$1 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 53bd90c..10df64a 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> if [ $# -eq 1 ]; then SESSION_NAME=$1 diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 8c93bf9..46befc8 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Hostname; diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index ff4c861..3720bf0 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index a6c2182..ce33520 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index 1b3f362..ceb62a9 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 266fac1..df707df 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,8 +15,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> package x2godbwrapper; diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 1d8b35a..7462550 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 72e124c..db29b5c 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index d58f5dd..b269800 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index db3598b..bc18d96 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index 2d29248..372208b 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index ce83544..6563705 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index f1b4c00..9269097 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; diff --git a/x2goserver/lib/x2gologlevel.pm b/x2goserver/lib/x2gologlevel.pm index 0d8fefd..1183e6c 100644 --- a/x2goserver/lib/x2gologlevel.pm +++ b/x2goserver/lib/x2gologlevel.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> package x2gologlevel; diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index c577474..2e64542 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 6c1e74e..53041f8 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use DBI; diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index f1922fe..7000281 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index e4b13a7..c7650f7 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 93da29a..963ab32 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Hostname; diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index fa9672b..1c4e6be 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 045999f..c1f0567 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -1,5 +1,5 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# 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> use strict; use Sys::Hostname; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 6cf528c..359f25e 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index 94320dd..a134efc 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -1,7 +1,7 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * Copyright (C) 2011 Moritz 'Morty' Strübe <morty(a)gmx.net> + * Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + * Copyright (C) 2011-2012 Moritz 'Morty' Strübe <morty(a)gmx.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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.9-3-g46a20a6
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 46a20a6b158b09a1f23f967063f7da2202fb2c8b (commit) via aedeaf1bff3743d4ee373857feed28c5c60d9f24 (commit) from 67d66c597240cd2a88c29142556acc4baada0f6e (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 46a20a6b158b09a1f23f967063f7da2202fb2c8b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:05:59 2012 +0100 Replace more strings ,,X2go'' with ,,X2Go''... commit aedeaf1bff3743d4ee373857feed28c5c60d9f24 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 15:05:13 2012 +0100 Replace all string ,,X2Go.' with ,,X2Go''. ----------------------------------------------------------------------- Summary of changes: INSTALL | 10 ++-- debian/changelog | 16 +++--- debian/control | 62 ++++++++++---------- debian/copyright | 2 +- debian/x2goserver-printing.postinst | 2 +- debian/x2goserver.init | 2 +- debian/x2goserver.postinst | 2 +- x2goserver-compat/bin/x2gosuspend | 2 +- x2goserver-compat/bin/x2gosuspend-agent | 2 +- x2goserver-compat/bin/x2goterminate | 2 +- x2goserver-compat/man/man8/x2gosuspend-agent.8 | 8 +- x2goserver-compat/man/man8/x2gosuspend.8 | 8 +- x2goserver-compat/man/man8/x2goterminate.8 | 8 +- .../share/x2gofeature.d/x2goserver-compat.features | 4 +- .../bin/x2goserver-run-extensions | 2 +- .../man/man8/x2goserver-run-extensions.8 | 22 ++++---- .../x2gofeature.d/x2goserver-extensions.features | 4 +- x2goserver-printing/bin/x2goprint | 8 +- x2goserver-printing/man/man8/x2goprint.8 | 28 +++++----- .../x2gofeature.d/x2goserver-printing.features | 4 +- x2goserver-pyhoca/bin/x2gosetkeyboard | 4 +- x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 | 12 ++-- .../share/x2gofeature.d/x2goserver-pyhoca.features | 4 +- x2goserver-xsession/etc/Xsession | 2 +- .../x2gofeature.d/x2goserver-xsession.features | 4 +- x2goserver/bin/x2gobasepath | 2 +- x2goserver/bin/x2gocmdexitmessage | 2 +- x2goserver/bin/x2gofeature | 4 +- x2goserver/bin/x2gogetservers | 2 +- x2goserver/bin/x2golistdesktops | 2 +- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2goresume-session | 2 +- x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2gosessionlimit | 2 +- x2goserver/bin/x2goshowblocks | 2 +- x2goserver/bin/x2gostartagent | 6 +- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 2 +- x2goserver/bin/x2goumount-session | 2 +- x2goserver/bin/x2goversion | 4 +- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2godbwrapper.pm | 2 +- x2goserver/lib/x2gogetagent | 2 +- x2goserver/lib/x2gogetdisplays | 2 +- x2goserver/lib/x2gogetports | 2 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2golistsessions_sql | 4 +- x2goserver/lib/x2gologlevel | 2 +- x2goserver/lib/x2gologlevel.pm | 2 +- x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gosqlitewrapper.pl | 2 +- x2goserver/lib/x2gosuspend-agent | 2 +- x2goserver/lib/x2gosyslog | 2 +- x2goserver/man/man8/x2gobasepath.8 | 8 +- x2goserver/man/man8/x2gocleansessions.8 | 8 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 8 +- x2goserver/man/man8/x2godbadmin.8 | 10 ++-- x2goserver/man/man8/x2gofeature.8 | 8 +- x2goserver/man/man8/x2golistdesktops.8 | 10 ++-- x2goserver/man/man8/x2golistmounts.8 | 10 ++-- x2goserver/man/man8/x2golistsessions.8 | 18 +++--- x2goserver/man/man8/x2golistsessions_root.8 | 8 +- x2goserver/man/man8/x2gomountdirs.8 | 18 +++--- x2goserver/man/man8/x2goresume-session.8 | 10 ++-- x2goserver/man/man8/x2goruncommand.8 | 12 ++-- x2goserver/man/man8/x2gosessionlimit.8 | 4 +- x2goserver/man/man8/x2goshowblocks.8 | 8 +- x2goserver/man/man8/x2gostartagent.8 | 18 +++--- x2goserver/man/man8/x2gosuspend-session.8 | 10 ++-- x2goserver/man/man8/x2goterminate-session.8 | 8 +- x2goserver/man/man8/x2goumount-session.8 | 16 +++--- x2goserver/man/man8/x2goversion.8 | 18 +++--- x2goserver/sbin/x2gocleansessions | 2 +- x2goserver/sbin/x2godbadmin | 2 +- x2goserver/sbin/x2golistsessions_root | 2 +- x2goserver/share/x2gofeature.d/x2goserver.features | 4 +- x2goserver/x2gosqlitewrapper.c | 2 +- 81 files changed, 260 insertions(+), 260 deletions(-) The diff of changes is: diff --git a/INSTALL b/INSTALL index eeac765..4bbf432 100644 --- a/INSTALL +++ b/INSTALL @@ -65,7 +65,7 @@ have to be members of your server system's ,,fuse'' group Also users that shall be able to send print jobs to client-side printers have to be members of the server-side ,,fuse'' group (see above). -As X2go printing setups can be rather versatile, details on X2go printing are explained in +As X2Go printing setups can be rather versatile, details on X2Go printing are explained in the project's wiki: http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu @@ -78,11 +78,11 @@ http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu 7a.) DEFAULT: SQLite setup -------------------------- -This variant is the default X2go database setup. The X2go database keeps track of -running/suspended/finished X2go sessions, mounted devices, etc. If you use SQLite -as DB backend, X2go will run on one single server. +This variant is the default X2Go database setup. The X2Go database keeps track of +running/suspended/finished X2Go sessions, mounted devices, etc. If you use SQLite +as DB backend, X2Go will run on one single server. -For multi-X2goServer support use the PostgreSQL setup variant of X2go server. All files +For multi-X2goServer support use the PostgreSQL setup variant of X2Go server. All files should be present for this setup. If not, please report it as a bug. diff --git a/debian/changelog b/debian/changelog index aec1bf3..1d27514 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.0.99.10): - - Continue development... + - Replace all string ,,X2Go.' with ,,X2Go''. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:43:21 +0100 @@ -58,7 +58,7 @@ x2goserver (3.0.99.7-0~x2go1) unstable; urgency=low * New upstream version (3.0.99.7): - Move x2golistmounts script from x2goserver-extensions to x2goserver core. - - X2go server extensions: fix regular expression when scanning modality dirs. + - X2Go server extensions: fix regular expression when scanning modality dirs. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Oct 2011 13:04:54 +0200 @@ -107,7 +107,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low - Present an ISO-8601 compliant datetime string in session lists rendered by x2golistsessions (and similar) command(s). - Silence knotify SIGHUP signals in case that no knotify is running in the - X2go session. + X2Go session. - Fix x2goumount-session for individual paths (folder type: disk), ToDo: folder type CDROM and removable media. - Let db_insertmount create a proper return value (success vs. failed). @@ -118,7 +118,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low - Identified x2goumount script (x2goserver-compat) as a necessary component of x2gognomebindings and moved it there (with new name: x2goumount-session-gnome). - - Add x2golistmounts script to X2go server extensions. + - Add x2golistmounts script to X2Go server extensions. - Add x2gofeature script and x2gofeature.d subscripts. - Add x2gofeature man page. - Move x2goversion script into x2goserver core. @@ -133,7 +133,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low x2goterminate-session or when x2goruncommand is about to exit. - Resume/suspend x2godesktopsharing during x2goresume-session, x2gosuspend-session. - - Provide pluggable X2go extension system for main X2go server + - Provide pluggable X2Go extension system for main X2Go server functions. - Provide man page for x2goserver-run-extensions that explains the new plug-in mechanism of x2goserver. @@ -155,7 +155,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low [ Moritz Strübe ] * Improvements for new upstream version (3.0.99.6): - - Make digits at the beginning of X2go server extension scripts a must, not a + - Make digits at the beginning of X2Go server extension scripts a must, not a suggestion. [ Ivan Kabaivanov ] @@ -179,14 +179,14 @@ x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low * splitting up x2goserver package into x2goserver and x2goserver-extensions (x2goserver provides full functionality to legacy x2goclient, x2goserver-extensions is a container/namespace for add-on tools/scripts - needed for other client implementations like Python X2go. + needed for other client implementations like Python X2Go. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 31 May 2011 10:57:15 +0200 x2goserver (3.0.99.5-0~x2go1) unstable; urgency=low * adds x2goprint to x2goserver package - * implements X2go MIME Box feature + * implements X2Go MIME Box feature * fixes installation conflicts with x2goserver-one, x2goserver-home and x2goprint * change of version numbering scheme diff --git a/debian/control b/debian/control index 89dc5b2..ff07d92 100644 --- a/debian/control +++ b/debian/control @@ -49,8 +49,8 @@ Breaks: Replaces: x2goserver-one, x2goserver-home, -Description: X2go server daemon scripts - X2go is a server based computing environment with +Description: X2Go server daemon scripts + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -59,14 +59,14 @@ Description: X2go server daemon scripts - authentication by smartcard and USB stick . This package contains the main daemon and tools for - X2go server-side session administrations. + X2Go server-side session administrations. . The x2goserver package provides full functionality - for running the X2go project's legacy X2go client + for running the X2Go project's legacy X2Go client (x2goclient) on the client-side. . However, if you intend using other client implementations - of X2go make sure that you also have X2go server + of X2Go make sure that you also have X2Go server extensions package (x2goserver-extensions) installed. Package: x2goserver-printing @@ -81,8 +81,8 @@ Replaces: x2goprint Suggests: cups-x2go -Description: X2go server daemon scripts (printing) - X2go is a server based computing environment with +Description: X2Go server daemon scripts (printing) + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -90,17 +90,17 @@ Description: X2go server daemon scripts (printing) - audio support - authentication by smartcard and USB stick . - The X2go server printing package provides - client-side printing support for X2go. + The X2Go server printing package provides + client-side printing support for X2Go. . - This package has to be installed on X2go servers - that shall be able to pass X2go print jobs on - to the X2go client. + This package has to be installed on X2Go servers + that shall be able to pass X2Go print jobs on + to the X2Go client. . This package co-operates with the cups-x2go CUPS - backend. If CUPS server and X2go server are hosted + backend. If CUPS server and X2Go server are hosted on different machines, then make sure you install - this package on the X2go server/s (and the cups-x2go + this package on the X2Go server/s (and the cups-x2go package on the CUPS server). Package: x2goserver-compat @@ -108,8 +108,8 @@ Architecture: all Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~) -Description: X2go server daemon scripts (backwards compatitbity to old client versions) - X2go is a server based computing environment with +Description: X2Go server daemon scripts (backwards compatitbity to old client versions) + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -118,7 +118,7 @@ Description: X2go server daemon scripts (backwards compatitbity to old client ve - authentication by smartcard and USB stick . This package contains compatitbility scripts to allow - old x2goclient versions to connect to your X2go server. + old x2goclient versions to connect to your X2Go server. Package: x2goserver-extensions Architecture: all @@ -126,8 +126,8 @@ Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-xkb-utils -Description: X2go server daemon scripts (extensions) - X2go is a server based computing environment with +Description: X2Go server daemon scripts (extensions) + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -135,12 +135,12 @@ Description: X2go server daemon scripts (extensions) - audio support - authentication by smartcard and USB stick . - The X2go server extension namespace offers contributors - to add script functionality to X2go that is not - needed/ignored by the legacy X2go client (x2goclient). + The X2Go server extension namespace offers contributors + to add script functionality to X2Go that is not + needed/ignored by the legacy X2Go client (x2goclient). . Make sure you have this package installed on your server - if you want non-legacy X2go clients to be able to + if you want non-legacy X2Go clients to be able to access your server without lack of features. Package: x2goserver-xsession @@ -149,8 +149,8 @@ Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-common -Description: X2go server daemon scripts (Xsession runner) - X2go is a server based computing environment with +Description: X2Go server daemon scripts (Xsession runner) + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -158,21 +158,21 @@ Description: X2go server daemon scripts (Xsession runner) - audio support - authentication by smartcard and USB stick . - This X2go server add-on enables Xsession script handling - when starting desktop sessions with X2go. + This X2Go server add-on enables Xsession script handling + when starting desktop sessions with X2Go. . Amongst others the parsing of Xsession scripts will enable desktop-profiles, ssh-agent startups, gpgagent startups and many more Xsession related features on - X2go session login automagically. + X2Go session login automagically. Package: x2goserver-pyhoca Architecture: all Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), -Description: X2go server daemon scripts (add-ons for pyhoca client) - X2go is a server based computing environment with +Description: X2Go server daemon scripts (add-ons for pyhoca client) + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -180,7 +180,7 @@ Description: X2go server daemon scripts (add-ons for pyhoca client) - audio support - authentication by smartcard and USB stick . - This X2go server add-on adds extra functionality when using + This X2Go server add-on adds extra functionality when using the pyhoca client (GUI or cmdline tool). The installation of this package is completely optional, the pyhoca client will work without. diff --git a/debian/copyright b/debian/copyright index 23cc85f..ad32b1a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-M. Graesing <heinz-m.graesing(a)obviously-nice.de> -Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst index 7c1451c..b17c55e 100755 --- a/debian/x2goserver-printing.postinst +++ b/debian/x2goserver-printing.postinst @@ -21,7 +21,7 @@ set -e case "$1" in configure) ### - ### X2go printing + ### X2Go printing ### # setup x2goprint user and x2goprint group diff --git a/debian/x2goserver.init b/debian/x2goserver.init index b553c3a..be3631c 100644 --- a/debian/x2goserver.init +++ b/debian/x2goserver.init @@ -5,7 +5,7 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Start and stop the X2go daemon +# Short-Description: Start and stop the X2Go daemon ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 9d5d3bb..b84f7db 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -26,7 +26,7 @@ case "$1" in chmod 600 /etc/x2go/x2gosql/passwords/pgadmin ### - ### X2go session DB management + ### X2Go session DB management ### # setup x2gouser and group diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend index 4ddd3df..8dd489c 100755 --- a/x2goserver-compat/bin/x2gosuspend +++ b/x2goserver-compat/bin/x2gosuspend @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver-compat/bin/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent index 9ca6d4f..90d3973 100755 --- a/x2goserver-compat/bin/x2gosuspend-agent +++ b/x2goserver-compat/bin/x2gosuspend-agent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver-compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate index 125d228..7f6fcba 100755 --- a/x2goserver-compat/bin/x2goterminate +++ b/x2goserver-compat/bin/x2goterminate @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 index e6e8116..4eb6564 100644 --- a/x2goserver-compat/man/man8/x2gosuspend-agent.8 +++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2gosuspend-agent \- X2go Server Script (deprecated, shipped for compatibility with old clients) +x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2gosuspend-agent \- X2go Server Script (deprecated, shipped for compatibility w x2gosuspend-agent <session-name> .SH DESCRIPTION -\fBx2gosuspend\fR is a deprecated script belonging to X2go Server. The availability of this script +\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script is required to allow session suspending for old \fBx2goclient\fR versions. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8 index af119ee..ebb0cac 100644 --- a/x2goserver-compat/man/man8/x2gosuspend.8 +++ b/x2goserver-compat/man/man8/x2gosuspend.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with old clients) +x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with ol x2gosuspend <session-name> .SH DESCRIPTION -\fBx2gosuspend\fR is a deprecated script belonging to X2go Server. The availability of this script +\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script is required to allow session suspending for old \fBx2goclient\fR versions. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8 index 68fc016..8e170a0 100644 --- a/x2goserver-compat/man/man8/x2goterminate.8 +++ b/x2goserver-compat/man/man8/x2goterminate.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goterminate 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goterminate \- X2go Server Script (deprecated, shipped for compatibility with old clients) +x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2goterminate \- X2go Server Script (deprecated, shipped for compatibility with x2goterminate <session-name> .SH DESCRIPTION -\fBx2goterminate\fR is a deprecated script belonging to X2go Server. The availability of this script +\fBx2goterminate\fR is a deprecated script belonging to X2Go Server. The availability of this script is required to allow session termination from old \fBx2goclient\fR versions. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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-compat/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features index 030aa6e..5f3f5b0 100755 --- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features +++ b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_COMPAT_SCRIPTS") echo "ok"; exit 0;; diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 3a640a2..2cb3c4d 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index 2a5ad19..c0fb50b 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goserver-run-extensions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goserver-run-extensions \- Run X2go Server Extensions +x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS 'nh .fi @@ -15,15 +15,15 @@ x2goserver-run-extensions \- Run X2go Server Extensions x2goserver-run-extensions <session_id> <modality> .SH DESCRIPTION -\fBx2goserver-run-extensions\fR is called from within a number of X2go Server core scripts. +\fBx2goserver-run-extensions\fR is called from within a number of X2Go Server core scripts. .PP \fIWARNING:\fR Do not call it directly unless you really know what you are doing. .PP \fBx2goserver-run-extensions\fR executes scripts that have been -provided by third-party X2go extension packages. +provided by third-party X2Go extension packages. .PP -What this man page is about is not the script usage itself but the way of how to provide X2go server -extensions and features without the need to change the core X2go server scripts. +What this man page is about is not the script usage itself but the way of how to provide X2Go server +extensions and features without the need to change the core X2Go server scripts. .SH MODALITIES \fBx2goserver-run-extensions\fR is called with user privileges, as first cmd line argument the session ID is provided as the second cmd line argument a (what we call it) modality is provided. @@ -31,7 +31,7 @@ as the second cmd line argument a (what we call it) modality is provided. This modality tells \fBx2goserver-run-extensions\fR at what stage of an X2go session startup, resumption, suspension or termination the calling script currently is at. .PP -Calling X2go Server core scripts currently are: \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR, +Calling X2Go Server core scripts currently are: \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR, \fBx2gosuspend-session(8)\fR or \fBx2goterminate-session(8)\fR. .PP The modality names all refer to a sub-directory of the path: @@ -40,7 +40,7 @@ The modality names all refer to a sub-directory of the path: where <INSTALL_PREFIX> mostly is /usr on commonly-used GNU/Linux systems. .PP -In any of these sub-directories third-party X2go extension packages can place scripts or binaries that will then get executed by the core X2go server +In any of these sub-directories third-party X2Go extension packages can place scripts or binaries that will then get executed by the core X2Go server commands, either before or after the essential functionality (e.g. x2goagent startup, x2goagent suspension, x2goagent resumption, etc.) or on failure of that essential functionality. .PP @@ -65,13 +65,13 @@ The following table shows the available modalities, the calling scripts and the post-terminate extensions/post-terminate.d/ fail-terminate extensions/fail-terminate.d/ -\fIIMPORTANT:\fR When providing X2go Server extensions by this mechanism, please pretty well make sure that these extension scripts of yours that you place +\fIIMPORTANT:\fR When providing X2Go Server extensions by this mechanism, please pretty well make sure that these extension scripts of yours that you place in either of the above folders do under no circumstance fail during execution. Return codes are ignored and failures are therefore not (yet) propagated. .SH EXECUTION OF EXTENSIONS Scripts (or binaries) that have been placed into one of the pre/post/fail modality folders (see above) are executed in alpha-numerical sorting order. .PP Extensions will only get executed if their file names start with three digits. -This restriction is there to make sure that X2go Server extensions get executed in the correct/wanted order: +This restriction is there to make sure that X2Go Server extensions get executed in the correct/wanted order: .PP For example: 010_x2goserver-statistics @@ -83,5 +83,5 @@ As exitcode \fBx2goserver-run-extensions\fR always returns 0 and pretends to be .SH SEE ALSO \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR, \fBx2gosuspend-session(8)\fR and \fBx2goterminate-session(8)\fR. .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 509e5a4..23167f8 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_RUN_EXTENSIONS") echo "ok"; exit 0;; diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index 480c583..b53c373 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -109,7 +109,7 @@ if ( $mounts=~m/$spooldir/) # we will copy the print files from the temp location above to # the SSHFS share mounted from the client system. - syslog('info', "client-side spool dir is mounted, transferring printable file $pdfFile to X2go client system"); + syslog('info', "client-side spool dir is mounted, transferring printable file $pdfFile to X2Go client system"); if (not move("$printdir/$pdfFile", "$spooltmp")) { syslog('err', "ERROR: x2goprint failed to process print spool job for file $pdfFile"); @@ -118,7 +118,7 @@ if ( $mounts=~m/$spooldir/) chown $uid, $gid, "$spooltmp/$pdfFile"; system("su $user -c \"mv $spooltmp/$pdfFile $spooldir\""); - syslog('debug', "x2goprint moved file $pdfFile to X2go client's spool dir"); + syslog('debug', "x2goprint moved file $pdfFile to X2Go client's spool dir"); open (RFILE,">$spooltmp/$pdfFile.ready"); print RFILE "$pdfFile\n$title"; @@ -126,7 +126,7 @@ if ( $mounts=~m/$spooldir/) chown $uid, $gid, "$spooltmp/$pdfFile.ready"; system ("su $user -c \"mv $spooltmp/$pdfFile.ready $spooldir\""); - syslog('debug', "x2goprint moved file $pdfFile.ready to X2go client's spool dir, X2go client should start the print dialog very soon"); + syslog('debug', "x2goprint moved file $pdfFile.ready to X2Go client's spool dir, X2Go client should start the print dialog very soon"); } else { diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8 index 1075652..11a5e0a 100644 --- a/x2goserver-printing/man/man8/x2goprint.8 +++ b/x2goserver-printing/man/man8/x2goprint.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goprint 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goprint \- Process X2go Print Job +x2goprint \- Process X2Go Print Job .SH SYNOPSIS 'nh .fi @@ -15,15 +15,15 @@ x2goprint \- Process X2go Print Job x2goprint <username> <session_id> <pdf_file> <title_file> .SH DESCRIPTION -X2go print jobs are rendered by the \fBcups-x2go\fR backend on your network's (central) CUPS server and -then get copied to the X2go server that the X2go print job was issued from. +X2Go print jobs are rendered by the \fBcups-x2go\fR backend on your network's (central) CUPS server and +then get copied to the X2Go server that the X2Go print job was issued from. .PP -On that X2go server \fBcups-x2go\fR places two print job files (a PDF file and a title file) +On that X2Go server \fBcups-x2go\fR places two print job files (a PDF file and a title file) into the home directory of the POSIX system user ,,x2goprint'' where they await further processing by \fBx2goprint\fR. .PP -The \fBx2goprint\fR command on the session's X2go server (executed by \fBcups-x2go\fR backend) then -prepares the job files for delivery to the X2go client-side. +The \fBx2goprint\fR command on the session's X2Go server (executed by \fBcups-x2go\fR backend) then +prepares the job files for delivery to the X2Go client-side. .PP \fBx2goprint\fR must run with root privileges and is executed by \fBcups-x2go\fR. .SH ARGUMENTS @@ -32,7 +32,7 @@ prepares the job files for delivery to the X2go client-side. The owner of the incoming print jobs is given as the <username> argument. .TP \*(T<\fB\<session_id>\fR\*(T> -The <session_id> is the unique identifier of the X2go session that the processed print job is +The <session_id> is the unique identifier of the X2Go session that the processed print job is coming from. .TP \*(T<\fB\<pdf_file>\fR\*(T> @@ -42,14 +42,14 @@ The filename of the PDF file as dropped into ~x2goprint by \fBcups-x2go\fR. The filename of the title file as dropped into ~x2goprint by \fBcups-x2go\fR. .PP .SH PERMISSIONS -X2go uses the fuse-based SSH filesystem (SSHFS) for transferring print jobs from X2go server to X2go client. -Users that shall use X2go printing must be members of the X2go server's ,,fuse'' POSIX group. +X2Go uses the fuse-based SSH filesystem (SSHFS) for transferring print jobs from X2Go server to X2Go client. +Users that shall use X2Go printing must be members of the X2Go server's ,,fuse'' POSIX group. .PP .SH X2GO CLUSTER MODE -If X2go server and CUPS server are the same machine, no further setup for X2go printing is necessary. +If X2Go server and CUPS server are the same machine, no further setup for X2Go printing is necessary. .PP -However, if X2go server and CUPS server are hosted on separate machines then a special setup of sudo and SSH -is required on X2go server(s) and the central CUPS server. +However, if X2Go server and CUPS server are hosted on separate machines then a special setup of sudo and SSH +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 @@ -60,5 +60,5 @@ If \fBx2goprint\fR has run successfully, an exitcode of 0 is returned. If the sc 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 +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-printing/share/x2gofeature.d/x2goserver-printing.features b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features index 7332656..8b0be89 100755 --- a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features +++ b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_PRINTING") echo "ok"; exit 0;; diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard index 4073fa9..6b00e88 100755 --- a/x2goserver-pyhoca/bin/x2gosetkeyboard +++ b/x2goserver-pyhoca/bin/x2gosetkeyboard @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ test -f ${X2GO_CLIENT_KBD_FILE} || exit 0 read_keyboard_file() { - # retrieve keyboard settings from keyboard file in X2go session dir + # 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) diff --git a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 index e77ee77..77c5055 100644 --- a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 +++ b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" +.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2Go Server Tool (Extension)" .SH NAME -x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client +x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS 'nh .fi @@ -15,10 +15,10 @@ x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Cli x2gosetkeyboard .SH DESCRIPTION -\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects -the X2go session keyboard settings requested from the client side. +\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2Go session directory and introspects +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 +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 @@ -30,5 +30,5 @@ If the command fails on its way, then the exitcode of the failing command is ret ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features index eb0dce4..e9a3080 100755 --- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features +++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index bda13bd..c241b41 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -2,7 +2,7 @@ # # /etc/x2go/Xsession # -# X2go Xsession file -- used by x2goserver Xsession.d add-on. +# X2Go Xsession file -- used by x2goserver Xsession.d add-on. # This file has been derived from the global Xsession file in Debian squeeze diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features index 9fb329e..4850483 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_XSESSION") echo "ok"; exit 0;; diff --git a/x2goserver/bin/x2gobasepath b/x2goserver/bin/x2gobasepath index 1716538..7a1adf1 100755 --- a/x2goserver/bin/x2gobasepath +++ b/x2goserver/bin/x2gobasepath @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index 8c96e92..f5b9fab 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index 6bb7d6a..adf85e6 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# run x2gofeature scripts of X2go extensions +# run x2gofeature scripts of X2Go extensions test -d $X2GO_SHARE_PATH/x2gofeature.d && { for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do $subscript $@ && exit 0 diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index 6d501a4..da7d048 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 743d23d..814e0a9 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 561c554..4a7671f 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 080aa94..847355e 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 203eb06..e1cdd5e 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 7ad09f4..95aae49 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b24d2f2..bb08016 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 073d0c0..a32b6eb 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index d762645..3b8171a 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 2af8749..a5a4310 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -248,13 +248,13 @@ fi X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go agent session with ID $SESSION_NAME" + $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 } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go agent session with ID $SESSION_NAME" + $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 diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index ffc19f9..df276b6 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index d07b9c0..53bd90c 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 971c689..8c93bf9 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index ecc11d1..ff4c861 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ if [ -n "$1" ]; then if [ -f "${X2GO_COMPONENT_VERFILE}" ]; then echo "$(get_version ${X2GO_COMPONENT_VERFILE})" else - echo "Version information for X2go component '$X2GO_COMPONENT' is not available." >&1 + echo "Version information for X2Go component '$X2GO_COMPONENT' is not available." >&1 fi else cd ${X2GO_VERSIONS_BASEPATH} diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index 5b75400..a6c2182 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index 92a3cdc..1b3f362 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 92e4549..266fac1 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 66b49df..1d8b35a 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 3ce65b9..72e124c 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index 6a637a2..d58f5dd 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index d1994e1..db3598b 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index 553af07..2d29248 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index bde7a25..ce83544 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ for ( $i=0;$i<@array;$i++) { my $sid = @ln[1]; dbsys_rmsessionsroot($sid); - syslog('debug', "Purging finished session from X2go db, session ID: $sid"); + syslog('debug', "Purging finished session from X2Go db, session ID: $sid"); } print "@array[$i]\n"; } diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index 945f84e..f1b4c00 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gologlevel.pm b/x2goserver/lib/x2gologlevel.pm index b6df771..0d8fefd 100644 --- a/x2goserver/lib/x2gologlevel.pm +++ b/x2goserver/lib/x2gologlevel.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 028e34f..c577474 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index c7ba72b..6c1e74e 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 1873fac..f1922fe 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index a4d70d0..e4b13a7 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index 01a9fd3..e2dde5c 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool" +.TH x2gobasepath 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" .SH NAME -x2gobasepath \- Detect Base Path of X2go Server Installation +x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2gobasepath \- Detect Base Path of X2go Server Installation x2gobasepath .SH DESCRIPTION -\fBx2gobasepath\fR writes the X2go server installation base path (/usr, /usr/local, ...) to stdout. +\fBx2gobasepath\fR writes the X2Go server installation base path (/usr, /usr/local, ...) to stdout. .PP \fBx2gobasepath\fR can be run with user privileges. .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index cfc79fc..baef7e8 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool" +.TH x2gocleansessions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" .SH NAME -x2gocleansessions \- X2go Server Cleanup Daemon +x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2gocleansessions \- X2go Server Cleanup Daemon x2gocleansessions .SH DESCRIPTION -\fBx2gocleansessions\fR is run as a service on X2go servers to handle the cleanup of stale sessions. +\fBx2gocleansessions\fR is run as a service on X2Go servers to handle the cleanup of stale sessions. .PP \fBx2gocleansessions\fR must be run (as a service) with root privileges. .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index c27f142..18ffdd7 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2gocmdexitmessage \- Exit Message of X2go Command +x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS 'nh .fi @@ -17,12 +17,12 @@ x2gocmdexitmessage <session_id> .SH DESCRIPTION \fBx2gocmdexitmessage\fR prints out the exit message of the last command run with \fBx2goruncommand\fR for session <session_id>. -\fBx2gocmdexitmessage\fR is run with X2go user privileges. +\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 +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/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index 01ac1b0..0ec4a07 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "July 2011" "Version 3.0.99.x" "X2go Server Admin Tool" +.TH x2godbadmin 8 "July 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" .SH NAME -x2godbadmin \- X2go Server Database Administrator +x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS 'nh .fi @@ -15,10 +15,10 @@ x2godbadmin \- X2go Server Database Administrator x2godbadmin <options> .SH DESCRIPTION -\fBx2godbadmin\fR is used to set up the initial X2go session database and perform other -maintenance tasks on the X2go server's database. +\fBx2godbadmin\fR is used to set up the initial X2Go session database and perform other +maintenance tasks on the X2Go server's database. .PP \fBx2godbadmin\fR must be run with root privileges. .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index f6e8584..be222c0 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool" +.TH x2gofeature 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" .SH NAME -x2gofeature \- Query X2go Feature Availability on X2go Server +x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS 'nh .fi @@ -20,10 +20,10 @@ before trying to use them. .PP \fBx2gofeature\fR can be run with user privileges. .SH RETURN VALUES -If feature <feature_name> is available on the X2go server, then ,,ok'' is written to stdout. +If feature <feature_name> is available on the X2Go server, then ,,ok'' is written to stdout. Otherwise the expression ,,not available'' is written to stdout. .SH SEE ALSO /usr/share/x2go/x2gofeature.d/*.features .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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 3703f79..f804b9a 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2golistdesktops 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS @@ -19,10 +19,10 @@ x2golistdesktops [<server_hostname>] If no server hostname is given at the command line, the fully qualified domain name of the local system is used here. .PP -\fBx2golistdesktops\fR is run with X2go user privileges and it is used by X2go clients to render -a list of available desktops that may be candidates for X2go desktop sharing (shadow sessions). +\fBx2golistdesktops\fR is run with X2Go user privileges and it is used by X2Go clients to render +a list of available desktops that may be candidates for X2Go desktop sharing (shadow sessions). .PP -The list of desktops will include local desktop sessions (launched via KDM, GDM, etc.) run by the same user, X2go desktop +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 @@ -32,5 +32,5 @@ As exitcode \fBx2golistdesktop\fR always returns 0. .SH SEE ALSO x2godesktopsharing(1) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index 1263a55..e8c19ad 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2golistmounts \- List Mounted Shares for an X2go Session +x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS 'nh .fi @@ -18,8 +18,8 @@ x2golistmounts <session_id> \fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2go session <session_id>. .PP -\fBx2golistmounts\fR is run with normal user privileges and it is used by X2go clients to render -a list of SSHFS mounts for a given X2go sessions. +\fBx2golistmounts\fR is run with normal user privileges and it is used by X2Go clients to render +a list of SSHFS mounts for a given X2Go sessions. .SH RETURN VALUES A line-by-line list of mounted shares is returned by \fBx2golistmounts\fR. Each line consists of two mount point attribute fields separated by the pipe symbol (,,|''). @@ -33,5 +33,5 @@ As exitcode \fBx2golistmounts\fR always returns 0. .SH SEE ALSO x2gomountdirs(8), x2goumount-session(8) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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.8 b/x2goserver/man/man8/x2golistsessions.8 index adbbac6..f1c162c 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2golistsessions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2golistsessions \- List Available X2go Sessions for User +x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS 'nh .fi @@ -15,17 +15,17 @@ x2golistsessions \- List Available X2go Sessions for User x2golistsessions [<server_hostname>|--all-servers] .SH DESCRIPTION -\fBx2golistsessions\fR returns a list of running or suspended X2go sessions for X2go server <server_hostname>. +\fBx2golistsessions\fR returns a list of running or suspended X2Go sessions for X2Go server <server_hostname>. If no server hostname is given at the command line, the session list query runs for the local system. .PP -\fBx2golistsessions\fR is run with normal user privileges and it is used by X2go clients to render -a list of available X2go sessions. +\fBx2golistsessions\fR is run with normal user privileges and it is used by X2Go clients to render +a list of available X2Go sessions. .SH X2GO CLUSTER MODE 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. +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 +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: @@ -50,5 +50,5 @@ 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 +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 9c7f18e..be21d7d 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool" +.TH x2golistsessions_root 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" .SH NAME -x2golistsessions_root \- List X2go Sessions for System +x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2golistsessions_root \- List X2go Sessions for System x2golistsessions_root [<server_hostname>] .SH DESCRIPTION -\fBx2golistsessions_root\fR shows a list of all available X2go sessions on the server <server_hostname>. +\fBx2golistsessions_root\fR shows a list of all available X2Go sessions on the server <server_hostname>. If no server hostname is given at the command line, the session list query runs for the local system. .PP \fBx2golistsessions_root\fR must be run with root privileges. @@ -25,5 +25,5 @@ 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 +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 33b8f09..81c8808 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gomountdirs 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2gomountdirs \- Share Client-Side Folder with X2go Session +x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS 'nh .fi @@ -16,9 +16,9 @@ x2gomountdirs <mount_type> <session_id> <username> <key_file> <dir1> [<dir2> [<d .SH DESCRIPTION \fBx2gomountdirs\fR mounts client-side folders or devices onto mountpoints that are accessible -from within your remote X2go session. +from within your remote X2Go session. .PP -\fBx2gomountdirs\fR is run with X2go user privileges and normally issued by an X2go client application. +\fBx2gomountdirs\fR is run with X2Go user privileges and normally issued by an X2Go client application. .SH ARGUMENTS .TP \*(T<\fB\<mount_type>\fR\*(T> @@ -26,7 +26,7 @@ If the mount type is set to ,,dir'' then the client-side mount target is interpr it is interpreted as a device. .TP \*(T<\fB\<session_id>\fR\*(T> -The <session_id> is the unique identifier of the X2go session that this command is run for. +The <session_id> is the unique identifier of the X2Go session that this command is run for. .TP \*(T<\fB\<username>\fR\*(T> The owner of session <session_id> is given as the <username> argument. @@ -35,11 +35,11 @@ The owner of session <session_id> is given as the <username> argument. Location of a temporary private SSH key file (only valid for this command execution). .TP \*(T<\fB\<dir1> [<dir2> [<dir3> [...]]]\fR\*(T> -A list of client-side folders or device mount points that shall be mounted for X2go session <session_id>. +A list of client-side folders or device mount points that shall be mounted for X2Go session <session_id>. .PP .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. +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: @@ -63,5 +63,5 @@ As exitcode \fBx2gomoundirs\fR always returns 0. .SH SEE ALSO x2goumount-session(8) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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 eb0e246..b0db3a9 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goresume-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goresume-session \- Resume X2go Session +x2goresume-session \- Resume X2Go Session .SH SYNOPSIS 'nh .fi @@ -18,15 +18,15 @@ x2goresume-session <session_id> \fBx2goresume-session\fR resumes the suspended session with session ID <session_id>. .PP This command is normally issued -by an X2go client application with X2go user privileges. +by an X2Go client application with X2Go user privileges. .SH RETURN VALUES \fBx2goresume-session\fR reports to stderr if resuming of session <session_id> failed. This very probably means that the session's X agent has died, so the session <session_id> will -be marked as finished in the X2go session database. +be marked as finished in the X2Go session database. .PP As exitcode \fBx2goresume-session\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goruncommand(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 +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/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 4a64515..52d03b4 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goruncommand 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goruncommand \- Launch Command inside an X2go Session +x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2goruncommand \- Launch Command inside an X2go Session x2goruncommand <display> <agent_pid> <session_id> <command> <sound_system> <session_type> .SH DESCRIPTION -\fBx2goruncommand\fR launches a(n X-based) command inside of a given X2go session. +\fBx2goruncommand\fR launches a(n X-based) command inside of a given X2Go session. .PP -\fBx2goruncommand\fR is run with X2go user privileges and normally executed by an X2go client application. +\fBx2goruncommand\fR is run with X2Go user privileges and normally executed by an X2Go client application. .SH ARGUMENTS .TP \*(T<\fB\<display>\fR\*(T> @@ -27,7 +27,7 @@ The X display number/port of the session this command is for. The process ID (pid) of the x2goagent instance that the given session runs in. .TP \*(T<\fB\<session_id>\fR\*(T> -The <session_id> is the unique identifier of the X2go session that this command is intended for. +The <session_id> is the unique identifier of the X2Go session that this command is intended for. .TP \*(T<\fB\<command>\fR\*(T> Execute command <command>. Full paths will be ignored, the command has to be in the server's $PATH. @@ -46,5 +46,5 @@ As exitcode \fBx2goruncommand\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-sessions(8) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index f1cbf96..ac59d66 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool" +.TH x2gosessionlimit 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS @@ -17,5 +17,5 @@ x2gosessionlimit .SH DESCRIPTION \fBx2gosessionlimit\fR is not yet documented as a man page... TODO! .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 372a995..b7ec0c7 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goshowblocks 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goshowblocks \- Show X2go-Mounted Block Devices +x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS 'nh .fi @@ -15,12 +15,12 @@ x2goshowblocks \- Show X2go-Mounted Block Devices x2goshowblocks <username> <session_id> .SH DESCRIPTION -\fBx2goshowblocks\fR lists mounted shares for user <username> and X2go session with ID <session_id>. +\fBx2goshowblocks\fR lists mounted shares for user <username> and X2Go session with ID <session_id>. .PP The \fBx2goshowblocks\fR must be run with root privileges. .SH SEE ALSO x2gomountdirs(8), x2goumount-session(8) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 65bc07e..4ba06c8 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2gostartagent \- Start a New X2go Session +x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS 'nh .fi @@ -15,10 +15,10 @@ x2gostartagent \- Start a New X2go Session x2gostartagent <geometry> <link_quality> <nx_pack_meth> <cache_type+dpi> <kblayout> <kbtype> <setkbd> <session_type> <command> .SH DESCRIPTION -\fBx2gostartagent\fR coordinates the startup process of a new X2go session. +\fBx2gostartagent\fR coordinates the startup process of a new X2Go session. It expects quite a list of parameters, all of which are obligatory. .PP -\fBx2gostartagent\fR is run with X2go user privileges and normally executed by an X2go client application. +\fBx2gostartagent\fR is run with X2Go user privileges and normally executed by an X2Go client application. .SH ARGUMENTS .TP \*(T<\fB\<geometry>\fR\*(T> @@ -31,7 +31,7 @@ Any value out of: modem, isdn, adsl, wan or lan. NX compression method (see below for possible values). .TP \*(T<\fB\<cache_type+dpi>\fR\*(T> -Cache type and color depth for X2go session window. The most common value is: unix-kde-depth_24 where ,,24'' is the color depth in bit. +Cache type and color depth for X2Go session window. The most common value is: unix-kde-depth_24 where ,,24'' is the color depth in bit. .TP \*(T<\fB\<kblayout>\fR\*(T> Keyboard layout (e.g. us, de, etc.). @@ -40,13 +40,13 @@ Keyboard layout (e.g. us, de, etc.). Keyboard type/model (e.g. pc105/us). .TP \*(T<\fB\<setkbd>\fR\*(T> -Force setting keyboard layout and type within the X2go session on startup. Values: 0 or 1. +Force setting keyboard layout and type within the X2Go session on startup. Values: 0 or 1. .TP \*(T<\fB\<session_type>\fR\*(T> -Allowed values for <session_type> are: D (desktop), R (rootless) or S (shadow session, X2go desktop sharing). +Allowed values for <session_type> are: D (desktop), R (rootless) or S (shadow session, X2Go desktop sharing). .TP \*(T<\fB\<command>\fR\*(T> -The command given by the <command> argument is only used to create the session ID for this new X2go session. The +The command given by the <command> argument is only used to create the session ID for this new X2Go session. The actual execution of a command is handled by \fBx2goruncommand\fR. .PP .SH RETURN VALUES @@ -81,5 +81,5 @@ rfb-hextile, rfb-tight, rfb-tight-compressed .SH SEE ALSO x2goruncommand(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 +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/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index f78e978..5acfe24 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2gosuspend-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2gosuspend-session \- Suspend an X2go Session +x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS 'nh .fi @@ -17,15 +17,15 @@ x2gosuspend-session <session_id> .SH DESCRIPTION \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. +This command is normally issued by an X2Go client application with X2Go user privileges. .SH RETURN VALUES \fBx2gosuspend-session\fR reports to stderr if resuming of session <session_id> failed. This very probably means that the session's X agent has died, so the session <session_id> will -be marked as finished in the X2go session database. +be marked as finished in the X2Go session database. .PP As exitcode \fBx2gosuspend-session\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goruncommand(8), x2goresume-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 +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/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index 9089c04..b619552 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goterminate-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goterminate-session \- Terminate an X2go Session +x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS 'nh .fi @@ -17,7 +17,7 @@ x2goterminate-session <session_id> .SH DESCRIPTION \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. +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 @@ -25,5 +25,5 @@ As exitcode \fBx2goterminate-session\fR always returns 0. .SH SEE ALSO x2gostartagent(8), x2goruncommand(8), x2goresume-session(8), x2gosuspend-session(8) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index a2cc555..0af51fe 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goumount-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" .SH NAME -x2goumount-session \- Unshare mounted Folders from X2go Session +x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS 'nh .fi @@ -15,18 +15,18 @@ x2goumount-session \- Unshare mounted Folders from X2go Session x2goumount-session <session_id> [<local_path_on_client>] .SH DESCRIPTION -\fBx2goumount-session\fR is used to unshare client folders from X2go session with session ID <session_id>. -Shared folders have been previously mounted into the X2go session by the \fBx2gomountdirs\fR command. +\fBx2goumount-session\fR is used to unshare client folders from X2Go session with session ID <session_id>. +Shared folders have been previously mounted into the X2Go session by the \fBx2gomountdirs\fR command. .PP -\fBx2goumount-session\fR is run with X2go user privileges and normally issued by an X2go client application. +\fBx2goumount-session\fR is run with X2Go user privileges and normally issued by an X2Go client application. .SH ARGUMENTS .TP \*(T<\fB\<session_id>\fR\*(T> -Unmount shared folder(s) as registered for X2go session ID <session_id> in the X2go session database. +Unmount shared folder(s) as registered for X2Go session ID <session_id> in the X2Go session database. .TP \*(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>. +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 @@ -38,5 +38,5 @@ unmounting a shared folder a non-zero exit code is returned. .SH SEE ALSO x2gomountdirs(8) .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index 4d99559..f91997c 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" +.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2Go Server Tool (Extension)" .SH NAME -x2goversion \- Retrieve Code Versions of X2go Server Components +x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS 'nh .fi @@ -15,24 +15,24 @@ x2goversion \- Retrieve Code Versions of X2go Server Components x2goversion [<x2go-component>] .SH DESCRIPTION -\fBx2goversion\fR allows to retrieve code versions of X2go server components. +\fBx2goversion\fR allows to retrieve code versions of X2Go server components. .PP If the -\fB[<x2go-component>]\fR parameter is omitted then a list of all available X2go server +\fB[<x2go-component>]\fR parameter is omitted then a list of all available X2Go server component names and versions is listed. .PP -If an X2go component is specified with the \fB[<x2go-component>]\fR parameter, then only the +If an X2Go component is specified with the \fB[<x2go-component>]\fR parameter, then only the 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. +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. +\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 .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +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/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index af5afee..93da29a 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index d65d752..fa9672b 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 6f4a510..045999f 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -1,5 +1,5 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 44458d9..6cf528c 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2go server core features +# check for X2Go server core features case "$X2GO_FEATURE" in "X2GO_LIST_DESKTOPS") echo "ok"; exit 0;; diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index 2b66245..94320dd 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -1,5 +1,5 @@ /* - * This file is part of the X2go Project - http://www.x2go.org + * This file is part of the X2Go Project - http://www.x2go.org * Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> * Copyright (C) 2011 Moritz 'Morty' Strübe <morty(a)gmx.net> * 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

x2goclient.git - build-main (branch) updated: 3.99.0.4
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, build-main has been updated via 1d1c2551d31b7f579e0596f43571da7dfa34c17b (commit) via 0589f7af52d4e8182b119fa598513d98203d708a (commit) via d71fc2fcfd9af5e6638df881b2ed040a08492949 (commit) from 1098f511f85416cc723c64a602fac381d7d215ba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 10 +++++++++- desktop/x2goclient.desktop | 2 +- onmainwindow_part4.cpp | 4 ++-- settingswidget.cpp | 3 --- version.h | 2 +- x2goplugin.rc | 12 ++++++------ 7 files changed, 20 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index d2b4138..7e58983 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.0.3 +3.99.0.4 diff --git a/debian/changelog b/debian/changelog index 460386e..60c4563 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goclient (3.99.0.4-0~x2go1) unstable; urgency=low + + [ Oleksandr Shneyder ] + * New upstream version (3.99.0.4): + - Enabled support for Xinerama + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:53:20 +0100 + x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low [ Mike Gabriel ] @@ -21,7 +29,7 @@ x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low in x2goagent needed) - Add -lXpm in project file. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 16:17:46 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:50:31 +0100 x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 918a344..5cc4280 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.0.3 +Version=3.99.0.4 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 5d8eecd..52b381d 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1148,11 +1148,11 @@ void ONMainWindow::slotXineramaConfigured() else xinSizeInc=-1; #ifdef Q_OS_LINUX + lastDisplayGeometry.setWidth(lastDisplayGeometry.width()+xinSizeInc); XSync(QX11Info::display(),false); XResizeWindow(QX11Info::display(), proxyWinId, - lastDisplayGeometry.width()+xinSizeInc,lastDisplayGeometry.height()); + lastDisplayGeometry.width(),lastDisplayGeometry.height()); XSync(QX11Info::display(),false); - lastDisplayGeometry=proxyWinGeometry(); #endif #ifdef Q_OS_WIN QRect geom; diff --git a/settingswidget.cpp b/settingswidget.cpp index 86c5395..1d1a229 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -270,9 +270,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, kbd->setChecked ( true ); custom->setChecked ( true ); readConfig(); - - cbXinerama->setVisible(false); - cbXinerama->setChecked(false); } diff --git a/version.h b/version.h index d74ef6a..6e5c5e0 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.0.3" +#define VERSION "3.99.0.4" diff --git a/x2goplugin.rc b/x2goplugin.rc index 1079f6d..05ee2b0 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,0,3 - PRODUCTVERSION 3,99,0,3 + FILEVERSION 3,99,0,4 + PRODUCTVERSION 3,99,0,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 0 ,3\0" + VALUE "FileVersion", "3, 99, 0 ,4\0" VALUE "InternalName", "x2goplugin\0" - VALUE "LegalCopyright", "Copyright � 2010 Obviously Nice\0" + VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.0.3\0" - VALUE "ProductVersion", "3, 99, 0, 3\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0" + VALUE "ProductVersion", "3, 99, 0, 4\0" END END BLOCK "VarFileInfo" 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

x2goclient.git - master (branch) updated: 3.99.0.3-3-g1d1c255
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 1d1c2551d31b7f579e0596f43571da7dfa34c17b (commit) from 0589f7af52d4e8182b119fa598513d98203d708a (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 1d1c2551d31b7f579e0596f43571da7dfa34c17b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:53:30 2012 +0100 release 3.99.0.4 ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 11 +++++++++-- desktop/x2goclient.desktop | 2 +- version.h | 2 +- x2goplugin.rc | 12 ++++++------ 5 files changed, 18 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index d2b4138..7e58983 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.0.3 +3.99.0.4 diff --git a/debian/changelog b/debian/changelog index b9120b6..60c4563 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goclient (3.99.0.4-0~x2go1) unstable; urgency=low + + [ Oleksandr Shneyder ] + * New upstream version (3.99.0.4): + - Enabled support for Xinerama + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:53:20 +0100 + x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low [ Mike Gabriel ] @@ -20,9 +28,8 @@ x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low - Multi-display support: support for xinerama (temporarily disabled--support in x2goagent needed) - Add -lXpm in project file. - - Enabled support for Xinerama - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 16:17:46 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:50:31 +0100 x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 918a344..5cc4280 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.0.3 +Version=3.99.0.4 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/version.h b/version.h index d74ef6a..6e5c5e0 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.0.3" +#define VERSION "3.99.0.4" diff --git a/x2goplugin.rc b/x2goplugin.rc index 1079f6d..05ee2b0 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,0,3 - PRODUCTVERSION 3,99,0,3 + FILEVERSION 3,99,0,4 + PRODUCTVERSION 3,99,0,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 0 ,3\0" + VALUE "FileVersion", "3, 99, 0 ,4\0" VALUE "InternalName", "x2goplugin\0" - VALUE "LegalCopyright", "Copyright � 2010 Obviously Nice\0" + VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.0.3\0" - VALUE "ProductVersion", "3, 99, 0, 3\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0" + VALUE "ProductVersion", "3, 99, 0, 4\0" END END BLOCK "VarFileInfo" 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 - build-main (branch) updated: redist-server/3.5.0.7-2-g8b013ce
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, build-main has been updated via 8b013ce809a9a01fde6444fb631864eca4ad244f (commit) via e9241fe8c730aa7f0b95b15b34ed5c2bda18b5ad (commit) via d7ecf7214f0df5cd7957264be5249f4cd39f4e6e (commit) via 1bd66f19cca344557602aa3640b32e747980f8d3 (commit) via 28b2a3a93daaa29a2635fb8ae670eccfe772e3d8 (commit) via 8d655bc1a12ce830467d86d131a100397201c98f (commit) via d086c36994b72b134949fc18f80dfa771480dbb9 (commit) via 55ee602bbb2b23abdbd2c2072c5cce7956044a11 (commit) via e32a5590f1e59b9332dcaaff04ec194c5f050d84 (commit) via 2be056d38759908d20fffc7adfff5d2a8b737eb6 (commit) via fa996b5bc0e46e9b270fb2b5b45ffc1a80331b06 (commit) via fdf0d1ccfaf3d13988ecbbe9306909d056e0bba0 (commit) via a295d73f6203acfdbfb044a69d6402978ce21b37 (commit) via 8199a5d2ac5270a52f7855513916b5ce444579d7 (commit) via 96cd4325b07e6062175851c1998f2535e6c948f0 (commit) via e40208d7c1ad1c80bf3e591405767a1106efa21f (commit) via 86dc688067b0aeb1d3977d26c0499d525cb23d4b (commit) via 1bbc9cc9e7fc01105cf0e3d5832e0acce9139495 (commit) via 496f31a511374f685df64df07e9c9c936419bb78 (commit) via df8dc83d1341aeec42f488bec79bca95db438b8f (commit) via 760c5c07c63798e0e065020456e7514c8dd8b72d (commit) via d6fee9a41fa3ba5db01d46963571a5a039ad1786 (commit) via 8f76198c5012a04ca8b5e10c3f133815008178ba (commit) via 0d3a820b3ed1f76860cdee8dc0532674d621f1e3 (commit) via d9d49b5d8606df5d400c34726cdc5fb9cccaa47b (commit) via 43de8b97236e4fe94d06c2152da732aafaaa32ce (commit) via fdfed536ce4408e19a0b0e4732e3630cd542c051 (commit) via 9d99eeb539ccb085dcce4899eed5926f0ea13f92 (commit) via 6ae3d7efcc0ad028809c69b6a43a19fdd2d9d100 (commit) via 405bc8f259f230947e5fe8341f0bab8f0f88c678 (commit) via 19f24873388ce9a2136f8d3fe8145d6ce4576730 (commit) via 3744795d3c3b526cd2438b6e9423f8f09b372db1 (commit) from eaea40dec0dc42e78b610837330cf39ca13beb8f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 67 +++++ debian/control | 22 ++ debian/libnx-mesa-extras-dev.lintian-overrides | 1 + debian/libnx-x11-dev.dirs | 1 + debian/libnx-x11-dev.install | 4 +- debian/libnx-x11-dev.lintian-overrides | 1 + debian/libnx-x11.dirs | 1 + debian/libnx-x11.install | 1 + debian/libnx-x11.lintian-overrides | 1 + debian/libxcomp-dev.lintian-overrides | 1 + debian/libxcomp3.lintian-overrides | 1 + debian/libxcompext-dev.lintian-overrides | 1 + debian/libxcompext3.lintian-overrides | 3 +- debian/libxcompshad-dev.lintian-overrides | 1 + debian/libxcompshad3.lintian-overrides | 3 +- debian/nxagent.lintian-overrides | 3 +- debian/nxauth.lintian-overrides | 3 +- debian/nxproxy.lintian-overrides | 3 +- ...0_add-NX-redistribution-README.full+lite.patch} | 0 .../patches/001_add-main-makefile.full+lite.patch | 51 ++++ debian/patches/001_add-main-makefile.patch | 51 ---- ...xcompshad_build-against-nx-x11-only.full.patch} | 0 ...gcc43.patch => 003_nxcompshad_gcc43.full.patch} | 0 ... => 004_nx-x11_fix-nxcompshad-build.full.patch} | 0 ...cc43.patch => 005_nxcomp_gcc43.full+lite.patch} | 0 ...h => 007_nxcompshad_clean-gch-files.full.patch} | 0 ...e.patch => 009_nxagent-add-man-page.full.patch} | 0 ...ch => 009_nxproxy-add-man-page.full+lite.patch} | 0 ..._nxauth_fix-binary-name-in-man-page.full.patch} | 0 debian/patches/011_nxcomp_sa-restorer.patch | 25 -- ... 012_nxcomp_makefile-uninstall.full+lite.patch} | 0 ...=> 013_nxcompext_makefile-uninstall.full.patch} | 0 ...> 014_nxcompshad_makefile-uninstall.full.patch} | 0 ...015_nxproxy_makefile-uninstall.full+lite.patch} | 0 .../016_nx-X11_install-location.debian.patch | 17 ++ .../patches/016_nx-x11_install-location.full.patch | 32 ++ debian/patches/016_nx-x11_install-location.patch | 32 -- ...x-x11_update-autotools-helper-files.full.patch} | 0 ...nx-x11_update-libtool-ltmain-script.full.patch} | 0 ...expat-build-against-system-libxmltok.full.patch | 43 +++ ...-x11_expat-build-against-system-libxmltok.patch | 43 --- debian/patches/020_add-nxagent-wrapper.full.patch | 28 ++ debian/patches/020_add-nxagent-wrapper.patch | 27 -- debian/patches/021_add-nxauth-wrapper.full.patch | 28 ++ debian/patches/021_add-nxauth-wrapper.patch | 27 -- .../022_add-nxproxy-wrapper.full+lite.patch | 28 ++ debian/patches/022_add-nxproxy-wrapper.patch | 27 -- .../patches/023_add-x2goagent-wrapper.full.patch | 28 ++ debian/patches/101_nxagent_set-rgb-path.full.patch | 19 ++ debian/patches/101_nxagent_set-rgb-path.patch | 19 -- ...erver-xext_set-securitypolicy-path.debian.patch | 19 ++ ...xserver-xext_set-securitypolicy-path.full.patch | 19 ++ .../102_xserver-xext_set-securitypolicy-path.patch | 19 -- .../103_nxagent_set-X0-config-path.full.patch | 40 +++ .../patches/103_nxagent_set-X0-config-path.patch | 40 --- ...agent_export-remote-keyboard-config.full.patch} | 0 ... => 106_nxagent_utf8-copy-clipboard.full.patch} | 0 ...oard-compound-text+small-bed-sheets.full.patch} | 0 ...tch => 108_nxagent_wine-close-delay.full.patch} | 0 ...9_nxagent_locale-utf8-compound-text.full.patch} | 0 ...0_nxagent_createpixmap-bounds-check.full.patch} | 0 ...00_nxagent_check-binary-x2go-flavour.full.patch | 64 +++++ debian/patches/200_nxagent_unbrand-agent.patch | 61 ---- ...t_set-x2go-icon-if-x2goagent-flavour.full.patch | 220 +++++++++++++++ .../patches/202_nx-x11_enable-xinerama.full.patch | 268 ++++++++++++++++++ .../patches/209_x2goagent-add-man-page.full.patch | 38 +++ debian/patches/300_nxagent_set-wm-class.full.patch | 60 ++++ ...gent_unbrand-nxagent-brand-x2goagent.full.patch | 296 ++++++++++++++++++++ debian/patches/series | 72 +++-- debian/source.lintian-overrides | 1 + debian/x2goagent.dirs | 3 + debian/x2goagent.install | 3 + debian/x2goagent.links | 1 + debian/x2goagent.lintian-overrides | 1 + debian/x2goagent.manpages | 1 + 75 files changed, 1460 insertions(+), 409 deletions(-) rename debian/patches/{000_add-NX-redistribution-README.patch => 000_add-NX-redistribution-README.full+lite.patch} (100%) create mode 100644 debian/patches/001_add-main-makefile.full+lite.patch delete mode 100644 debian/patches/001_add-main-makefile.patch rename debian/patches/{002_nxcompshad_build-against-nx-x11-only.patch => 002_nxcompshad_build-against-nx-x11-only.full.patch} (100%) rename debian/patches/{003_nxcompshad_gcc43.patch => 003_nxcompshad_gcc43.full.patch} (100%) rename debian/patches/{004_nx-x11_fix-nxcompshad-build.patch => 004_nx-x11_fix-nxcompshad-build.full.patch} (100%) rename debian/patches/{005_nxcomp_gcc43.patch => 005_nxcomp_gcc43.full+lite.patch} (100%) rename debian/patches/{007_nxcompshad_clean-gch-files.patch => 007_nxcompshad_clean-gch-files.full.patch} (100%) rename debian/patches/{009_nxagent-add-man-page.patch => 009_nxagent-add-man-page.full.patch} (100%) rename debian/patches/{009_nxproxy-add-man-page.patch => 009_nxproxy-add-man-page.full+lite.patch} (100%) rename debian/patches/{010_nxauth_fix-binary-name-in-man-page.patch => 010_nxauth_fix-binary-name-in-man-page.full.patch} (100%) delete mode 100644 debian/patches/011_nxcomp_sa-restorer.patch rename debian/patches/{012_nxcomp_makefile-uninstall.patch => 012_nxcomp_makefile-uninstall.full+lite.patch} (100%) rename debian/patches/{013_nxcompext_makefile-uninstall.patch => 013_nxcompext_makefile-uninstall.full.patch} (100%) rename debian/patches/{014_nxcompshad_makefile-uninstall.patch => 014_nxcompshad_makefile-uninstall.full.patch} (100%) rename debian/patches/{015_nxproxy_makefile-uninstall.patch => 015_nxproxy_makefile-uninstall.full+lite.patch} (100%) create mode 100644 debian/patches/016_nx-X11_install-location.debian.patch create mode 100644 debian/patches/016_nx-x11_install-location.full.patch delete mode 100644 debian/patches/016_nx-x11_install-location.patch rename debian/patches/{017_nx-x11_update-autotools-helper-files.patch => 017_nx-x11_update-autotools-helper-files.full.patch} (100%) rename debian/patches/{018_nx-x11_update-libtool-ltmain-script.patch => 018_nx-x11_update-libtool-ltmain-script.full.patch} (100%) create mode 100644 debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch delete mode 100644 debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch create mode 100644 debian/patches/020_add-nxagent-wrapper.full.patch delete mode 100644 debian/patches/020_add-nxagent-wrapper.patch create mode 100644 debian/patches/021_add-nxauth-wrapper.full.patch delete mode 100644 debian/patches/021_add-nxauth-wrapper.patch create mode 100644 debian/patches/022_add-nxproxy-wrapper.full+lite.patch delete mode 100644 debian/patches/022_add-nxproxy-wrapper.patch create mode 100644 debian/patches/023_add-x2goagent-wrapper.full.patch create mode 100644 debian/patches/101_nxagent_set-rgb-path.full.patch delete mode 100644 debian/patches/101_nxagent_set-rgb-path.patch create mode 100644 debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch create mode 100644 debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch delete mode 100644 debian/patches/102_xserver-xext_set-securitypolicy-path.patch create mode 100644 debian/patches/103_nxagent_set-X0-config-path.full.patch delete mode 100644 debian/patches/103_nxagent_set-X0-config-path.patch rename debian/patches/{105_nxagent_export-remote-keyboard-config.patch => 105_nxagent_export-remote-keyboard-config.full.patch} (100%) rename debian/patches/{106_nxagent_utf8-copy-clipboard.patch => 106_nxagent_utf8-copy-clipboard.full.patch} (100%) rename debian/patches/{107_nxagent_clipboard-compound-text+small-bed-sheets.patch => 107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch} (100%) rename debian/patches/{108_nxagent_wine-close-delay.patch => 108_nxagent_wine-close-delay.full.patch} (100%) rename debian/patches/{109_nxagent_locale-utf8-compound-text.patch => 109_nxagent_locale-utf8-compound-text.full.patch} (100%) rename debian/patches/{110_nxagent_createpixmap-bounds-check.patch => 110_nxagent_createpixmap-bounds-check.full.patch} (100%) create mode 100644 debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch delete mode 100644 debian/patches/200_nxagent_unbrand-agent.patch create mode 100644 debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch create mode 100644 debian/patches/202_nx-x11_enable-xinerama.full.patch create mode 100644 debian/patches/209_x2goagent-add-man-page.full.patch create mode 100644 debian/patches/300_nxagent_set-wm-class.full.patch create mode 100644 debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch create mode 100644 debian/x2goagent.dirs create mode 100644 debian/x2goagent.install create mode 100644 debian/x2goagent.links create mode 100644 debian/x2goagent.lintian-overrides create mode 100644 debian/x2goagent.manpages The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e0e37b7..72fb0f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,70 @@ +nx-libs (2:3.5.0.8-0) UNRELEASED; urgency=low + + * Reorganize patch names, to reflect patch inclusion into lite+full or + full-only ,,NX (redistributed)'' tarball. + * Update patch: 001_add-main-makefile.full+lite.patch, only build, install, + clean etc. NX subprojects if the folder exists. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 16 Jan 2012 22:28:13 +0100 + +nx-libs (2:3.5.0.7-0) unstable; urgency=low + + * Drop patch: 011_nxcomp_sa-restorer.patch. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 16 Jan 2012 11:28:14 +0100 + +nx-libs (2:3.5.0.6-0) unstable; urgency=low + + * Add patch: 202_nx-x11_enable-xinerama.patch. + * Fix lintian issue: missing-separator-between-items for x2goagent package. + Drop dependency on libnx-x11 as we already depend on nxagent and fix + description synopsis of x2goagent package. + * Add patch header/copyright to: 202_nx-x11_enable-xinerama.patch. + * Silence lintian on debian-revision-should-not-be-zero. As this is no Debian + packaging repository, but ,,NX (redistributed)'', we will always release + with rev no. set to ,,0''. + * Install libXinerama into libnx-x11 package. Header files into + libnx-x11-dev. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 13 Jan 2012 13:21:41 +0100 + +nx-libs (2:3.5.0.5-0) unstable; urgency=low + + * Fix wrapper script patches for nxagent, x2goagent, nxauth, nxproxy. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 13 Jan 2012 00:37:21 +0100 + +nx-libs (2:3.5.0.4-0) unstable; urgency=low + + * Update/fix patch: 999_nxagent_unbrand-nxagent-brand-x2goagent.patch. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jan 2012 23:04:37 +0100 + +nx-libs (2:3.5.0.3-0) unstable; urgency=low + + * Rename nxagent-unbrand patch, so that is the last patch to be applied + (999_<patchname>). + * Drop NX agent unbrand patch from FreeNX. + * Add X2Go agent / NX agent flavouring via patch system: + - 200_nxagent_check-binary-x2go-flavour.patch + - 201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch + - 300_nxagent_set-wm-class.patch + - 999_nxagent_unbrand-nxagent-brand-x2goagent.patch + * Add patch: 023_add-x2goagent-wrapper.patch. + * Add patch: 209_x2goagent-add-man-page.patch. + * Add binary package: x2goagent, includes man page + patch: 209_x2goagent-add-man-page.patch + * Modify patch: 101_nxagent_set-rgb-path.patch, add path to RGB file + if NX (redistributed) is installed via tarball under /usr/local. + * Provide patches that are tarball / distro aware. Either NX (redistributed) + has been installed to /usr/local/lib/nx via tarball or it has been + packaged for a distribution and is installed to /usr/lib/nx. Other + installation paths are currently not supported. + * Fix RGB color pallette (gray X2GO logo to be more accurate) for agent + splash screen. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jan 2012 13:04:03 +0100 + nx-libs (2:3.5.0.2-0) unstable; urgency=low * Re-add binary wrapper scripts to the patch system as we diff --git a/debian/control b/debian/control index 82cf2ae..383f7e9 100644 --- a/debian/control +++ b/debian/control @@ -94,6 +94,28 @@ Description: NX agent requests locally, ensuring that the most common source of round-trips are nearly reduced to zero. +Package: x2goagent +Architecture: any +Depends: + nxagent (>= ${source:Version}), + ${misc:Depends} +Suggests: + x2goserver +Description: X2Go agent + X2Go is a software suite that uses NX technology for remote desktop + computing. + . + NX technology implements a very efficient compression of the X11 protocol. + This increases performance when using X applications over a network, + especially a slow one. + . + X2Go agent functionality has been completely incorporated into NX agent's + code base. If the nxagent binary is executed under the name of `x2goagent', + the X2Go functionalities get activated. + . + The x2goagent package is a wrapper that activates X2Go branding in nxagent. + Please refer to the nxagent package's description for more information on NX. + Package: nxproxy Architecture: any Depends: diff --git a/debian/libnx-mesa-extras-dev.lintian-overrides b/debian/libnx-mesa-extras-dev.lintian-overrides index 3ecbd16..6646530 100644 --- a/debian/libnx-mesa-extras-dev.lintian-overrides +++ b/debian/libnx-mesa-extras-dev.lintian-overrides @@ -1 +1,2 @@ libnx-mesa-extras-dev: possible-new-upstream-release-without-new-version +libnx-mesa-extras-dev: debian-revision-should-not-be-zero diff --git a/debian/libnx-x11-dev.dirs b/debian/libnx-x11-dev.dirs index 8107c38..4496244 100644 --- a/debian/libnx-x11-dev.dirs +++ b/debian/libnx-x11-dev.dirs @@ -1 +1,2 @@ usr/include/nx/X11 +usr/include/nx/X11/extensions diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 0855739..2bf6c52 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,2 +1,4 @@ -nx-X11/.build-exports/include/* usr/include/nx/ +nx-X11/.build-exports/include/* usr/include/nx/X11/ +nx-X11/include/extensions/Xinerama.h usr/include/nx/X11/extensions/ + diff --git a/debian/libnx-x11-dev.lintian-overrides b/debian/libnx-x11-dev.lintian-overrides index a4bbdce..299bded 100644 --- a/debian/libnx-x11-dev.lintian-overrides +++ b/debian/libnx-x11-dev.lintian-overrides @@ -1 +1,2 @@ libnx-x11-dev: possible-new-upstream-release-without-new-version +libnx-x11-dev: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/libnx-x11.dirs b/debian/libnx-x11.dirs index fb609cc..88b4679 100644 --- a/debian/libnx-x11.dirs +++ b/debian/libnx-x11.dirs @@ -1,2 +1,3 @@ usr/lib/nx/X11 +usr/lib/nx/X11/Xinerama usr/share/nx diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index 7838d08..cfe4cff 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,2 +1,3 @@ nx-X11/.build-exports/lib/* usr/lib/nx/X11 +nx-X11/lib/Xinerama/libXinerama.so* usr/lib/nx/X11/Xinerama nx-X11/programs/Xserver/Xext/SecurityPolicy usr/share/nx diff --git a/debian/libnx-x11.lintian-overrides b/debian/libnx-x11.lintian-overrides index e89634d..b462ee4 100644 --- a/debian/libnx-x11.lintian-overrides +++ b/debian/libnx-x11.lintian-overrides @@ -1,3 +1,4 @@ libnx-x11: possible-new-upstream-release-without-new-version libnx-x11: postinst-has-useless-call-to-ldconfig libnx-x11: postrm-has-useless-call-to-ldconfig +libnx-x11: debian-revision-should-not-be-zero diff --git a/debian/libxcomp-dev.lintian-overrides b/debian/libxcomp-dev.lintian-overrides index e49d5c6..a19d92b 100644 --- a/debian/libxcomp-dev.lintian-overrides +++ b/debian/libxcomp-dev.lintian-overrides @@ -1,2 +1,3 @@ libxcomp-dev: possible-new-upstream-release-without-new-version +libxcomp-dev: debian-revision-should-not-be-zero diff --git a/debian/libxcomp3.lintian-overrides b/debian/libxcomp3.lintian-overrides index 6cf797d..e8bee05 100644 --- a/debian/libxcomp3.lintian-overrides +++ b/debian/libxcomp3.lintian-overrides @@ -1 +1,2 @@ libxcomp3: possible-new-upstream-release-without-new-version +libxcomp3: debian-revision-should-not-be-zero diff --git a/debian/libxcompext-dev.lintian-overrides b/debian/libxcompext-dev.lintian-overrides index 78e8d39..d1390c2 100644 --- a/debian/libxcompext-dev.lintian-overrides +++ b/debian/libxcompext-dev.lintian-overrides @@ -1,2 +1,3 @@ libxcompext-dev: possible-new-upstream-release-without-new-version +libxcompext-dev: debian-revision-should-not-be-zero diff --git a/debian/libxcompext3.lintian-overrides b/debian/libxcompext3.lintian-overrides index 8015a70..a6856ec 100644 --- a/debian/libxcompext3.lintian-overrides +++ b/debian/libxcompext3.lintian-overrides @@ -1 +1,2 @@ -libxcompext3: possible-new-upstream-release-without-new-version \ No newline at end of file +libxcompext3: possible-new-upstream-release-without-new-version +libxcompext3: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/libxcompshad-dev.lintian-overrides b/debian/libxcompshad-dev.lintian-overrides index ee4ac5b..4569b64 100644 --- a/debian/libxcompshad-dev.lintian-overrides +++ b/debian/libxcompshad-dev.lintian-overrides @@ -1,2 +1,3 @@ libxcompshad-dev: possible-new-upstream-release-without-new-version +libxcompshad-dev: debian-revision-should-not-be-zero diff --git a/debian/libxcompshad3.lintian-overrides b/debian/libxcompshad3.lintian-overrides index f35d410..3f14de9 100644 --- a/debian/libxcompshad3.lintian-overrides +++ b/debian/libxcompshad3.lintian-overrides @@ -1 +1,2 @@ -libxcompshad3: possible-new-upstream-release-without-new-version \ No newline at end of file +libxcompshad3: possible-new-upstream-release-without-new-version +libxcompshad3: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/nxagent.lintian-overrides b/debian/nxagent.lintian-overrides index d7e9cb5..b937ae4 100644 --- a/debian/nxagent.lintian-overrides +++ b/debian/nxagent.lintian-overrides @@ -1 +1,2 @@ -nxagent: possible-new-upstream-release-without-new-version \ No newline at end of file +nxagent: possible-new-upstream-release-without-new-version +nxagent: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/nxauth.lintian-overrides b/debian/nxauth.lintian-overrides index 4afde1d..0dd32c3 100644 --- a/debian/nxauth.lintian-overrides +++ b/debian/nxauth.lintian-overrides @@ -1 +1,2 @@ -nxauth: possible-new-upstream-release-without-new-version \ No newline at end of file +nxauth: possible-new-upstream-release-without-new-version +nxauth: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/nxproxy.lintian-overrides b/debian/nxproxy.lintian-overrides index d43c263..21fd7e4 100644 --- a/debian/nxproxy.lintian-overrides +++ b/debian/nxproxy.lintian-overrides @@ -1 +1,2 @@ -nxproxy: possible-new-upstream-release-without-new-version \ No newline at end of file +nxproxy: possible-new-upstream-release-without-new-version +nxproxy: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/patches/000_add-NX-redistribution-README.patch b/debian/patches/000_add-NX-redistribution-README.full+lite.patch similarity index 100% rename from debian/patches/000_add-NX-redistribution-README.patch rename to debian/patches/000_add-NX-redistribution-README.full+lite.patch diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch new file mode 100644 index 0000000..533ce7e --- /dev/null +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -0,0 +1,51 @@ +Description: Provide main Makefile for whole source tree + By design this patch is not needed to be sent upstream. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2011-12-31 +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,43 @@ ++#!/usr/bin/make -f ++ ++all: build ++ ++build: build-arch build-indep ++ ++clean: ++ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true ++ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true ++ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true ++ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true ++ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true ++ ++ ++distclean: ++ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true ++ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true ++ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true ++ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true ++ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true ++ ++build-arch: ++ test -d nxcomp && cd nxcomp && autoconf ++ test -d nxcompext && cd nxcompext && autoconf ++ test -d nxcompshad && cd nxcompshad && autoconf ++ test -d nx-X11 && cd nx-X11 && make World ++ test -d nxproxy && cd nxproxy && autoconf && ./configure && make ++ ++build-indep: ++ ++install: ++ test -d nxcomp && cd nxcomp && make install ++ test -d nxcompext && cd nxcompext && make install ++ test -d nxcompshad && cd nxcompshad && make install ++ test -d nx-X11 && cd nx-X11 && make install ++ test -d nxproxy && cd nxproxy && make install ++ ++uninstall: ++ test -d nxcomp && cd nxcomp && make uninstall ++ test -d nxcompext && cd nxcompext && make uninstall ++ test -d nxcompshad && cd nxcompshad && make uninstall ++ test -d nx-X11 && cd nx-X11 && make uninstall ++ test -d nxproxy && cd nxproxy && make uninstall diff --git a/debian/patches/001_add-main-makefile.patch b/debian/patches/001_add-main-makefile.patch deleted file mode 100644 index df3f4e7..0000000 --- a/debian/patches/001_add-main-makefile.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Provide main Makefile for whole source tree - By design this patch is not needed to be sent upstream. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,43 @@ -+#!/usr/bin/make -f -+ -+all: build -+ -+build: build-arch build-indep -+ -+clean: -+ cd nx-X11 && test -f Makefile && make $@ || true -+ cd nxcomp && test -f Makefile && make $@ || true -+ cd nxcompext && test -f Makefile && make $@ || true -+ cd nxcompshad && test -f Makefile && make $@ || true -+ cd nxproxy && test -f Makefile && make $@ || true -+ -+ -+distclean: -+ cd nx-X11 && test -f Makefile && make $@ || true -+ cd nxcomp && test -f Makefile && make $@ || true -+ cd nxcompext && test -f Makefile && make $@ || true -+ cd nxcompshad && test -f Makefile && make $@ || true -+ cd nxproxy && test -f Makefile && make $@ || true -+ -+build-arch: -+ cd nxcomp && autoconf -+ cd nxcompext && autoconf -+ cd nxcompshad && autoconf -+ cd nx-X11 && make World -+ cd nxproxy && autoconf && ./configure && make -+ -+build-indep: -+ -+install: -+ cd nxcomp && make install -+ cd nxcompext && make install -+ cd nxcompshad && make install -+ cd nx-X11 && make install -+ cd nxproxy && make install -+ -+uninstall: -+ cd nxcomp && make uninstall -+ cd nxcompext && make uninstall -+ cd nxcompshad && make uninstall -+ cd nx-X11 && make uninstall -+ cd nxproxy && make uninstall diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch similarity index 100% rename from debian/patches/002_nxcompshad_build-against-nx-x11-only.patch rename to debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch diff --git a/debian/patches/003_nxcompshad_gcc43.patch b/debian/patches/003_nxcompshad_gcc43.full.patch similarity index 100% rename from debian/patches/003_nxcompshad_gcc43.patch rename to debian/patches/003_nxcompshad_gcc43.full.patch diff --git a/debian/patches/004_nx-x11_fix-nxcompshad-build.patch b/debian/patches/004_nx-x11_fix-nxcompshad-build.full.patch similarity index 100% rename from debian/patches/004_nx-x11_fix-nxcompshad-build.patch rename to debian/patches/004_nx-x11_fix-nxcompshad-build.full.patch diff --git a/debian/patches/005_nxcomp_gcc43.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch similarity index 100% rename from debian/patches/005_nxcomp_gcc43.patch rename to debian/patches/005_nxcomp_gcc43.full+lite.patch diff --git a/debian/patches/007_nxcompshad_clean-gch-files.patch b/debian/patches/007_nxcompshad_clean-gch-files.full.patch similarity index 100% rename from debian/patches/007_nxcompshad_clean-gch-files.patch rename to debian/patches/007_nxcompshad_clean-gch-files.full.patch diff --git a/debian/patches/009_nxagent-add-man-page.patch b/debian/patches/009_nxagent-add-man-page.full.patch similarity index 100% rename from debian/patches/009_nxagent-add-man-page.patch rename to debian/patches/009_nxagent-add-man-page.full.patch diff --git a/debian/patches/009_nxproxy-add-man-page.patch b/debian/patches/009_nxproxy-add-man-page.full+lite.patch similarity index 100% rename from debian/patches/009_nxproxy-add-man-page.patch rename to debian/patches/009_nxproxy-add-man-page.full+lite.patch diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch b/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch similarity index 100% rename from debian/patches/010_nxauth_fix-binary-name-in-man-page.patch rename to debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch diff --git a/debian/patches/011_nxcomp_sa-restorer.patch b/debian/patches/011_nxcomp_sa-restorer.patch deleted file mode 100644 index afaa29f..0000000 --- a/debian/patches/011_nxcomp_sa-restorer.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: sa_restorer vs. memset - Use memset instead of setting .sa_restorer to NULL. -Forwarded: not-yet -Author: Stéphane Graber <stgraber(a)ubuntu.com> -Last-Update: 2011-12-31 ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -5895,7 +5895,7 @@ - - #if defined(__linux__) - -- newAction.sa_restorer = NULL; -+ memset(&newAction, NULL, sizeof(newAction)); - - #endif - -@@ -6513,7 +6513,7 @@ - - #if defined(__linux__) - -- action.sa_restorer = NULL; -+ memset(&action, NULL, sizeof(action)); - - #endif - diff --git a/debian/patches/012_nxcomp_makefile-uninstall.patch b/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch similarity index 100% rename from debian/patches/012_nxcomp_makefile-uninstall.patch rename to debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch diff --git a/debian/patches/013_nxcompext_makefile-uninstall.patch b/debian/patches/013_nxcompext_makefile-uninstall.full.patch similarity index 100% rename from debian/patches/013_nxcompext_makefile-uninstall.patch rename to debian/patches/013_nxcompext_makefile-uninstall.full.patch diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.patch b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch similarity index 100% rename from debian/patches/014_nxcompshad_makefile-uninstall.patch rename to debian/patches/014_nxcompshad_makefile-uninstall.full.patch diff --git a/debian/patches/015_nxproxy_makefile-uninstall.patch b/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch similarity index 100% rename from debian/patches/015_nxproxy_makefile-uninstall.patch rename to debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch new file mode 100644 index 0000000..9d4fe1b --- /dev/null +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -0,0 +1,17 @@ +Description: FHS adaptation for Debian packaging + On Debian, NX libraries and binaries are installed to + /usr/lib/nx. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2012-12-31 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -825,7 +825,7 @@ + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif diff --git a/debian/patches/016_nx-x11_install-location.full.patch b/debian/patches/016_nx-x11_install-location.full.patch new file mode 100644 index 0000000..0231bcb --- /dev/null +++ b/debian/patches/016_nx-x11_install-location.full.patch @@ -0,0 +1,32 @@ +Description: FHS adaptation for Debian packaging + From tarball, NX libraries and binaries are installed to + /usr/local/lib/nx. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2012-12-31 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -820,12 +820,12 @@ + + #ifndef UsrLibDir + #ifdef ProjectRoot +-#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) ++#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat3(/usr,/,LibDirName) ++#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +@@ -863,7 +863,7 @@ + #endif + #ifndef IncRoot + #ifdef ProjectRoot +-#define IncRoot Concat(ProjectRoot,/include) ++#define IncRoot Concat(ProjectRoot,/include/nx) + #ifndef AlternateIncRoot + #define AlternateIncRoot YES + #endif diff --git a/debian/patches/016_nx-x11_install-location.patch b/debian/patches/016_nx-x11_install-location.patch deleted file mode 100644 index 1bda0b0..0000000 --- a/debian/patches/016_nx-x11_install-location.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: FHS adaptation for Debian packaging - On Debian, NX libraries and binaries are installed to - /usr/lib/nx. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2012-12-31 ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -820,12 +820,12 @@ - - #ifndef UsrLibDir - #ifdef ProjectRoot --#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) -+#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir Concat3(/usr,/,LibDirName) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif -@@ -863,7 +863,7 @@ - #endif - #ifndef IncRoot - #ifdef ProjectRoot --#define IncRoot Concat(ProjectRoot,/include) -+#define IncRoot Concat(ProjectRoot,/include/nx) - #ifndef AlternateIncRoot - #define AlternateIncRoot YES - #endif diff --git a/debian/patches/017_nx-x11_update-autotools-helper-files.patch b/debian/patches/017_nx-x11_update-autotools-helper-files.full.patch similarity index 100% rename from debian/patches/017_nx-x11_update-autotools-helper-files.patch rename to debian/patches/017_nx-x11_update-autotools-helper-files.full.patch diff --git a/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch b/debian/patches/018_nx-x11_update-libtool-ltmain-script.full.patch similarity index 100% rename from debian/patches/018_nx-x11_update-libtool-ltmain-script.patch rename to debian/patches/018_nx-x11_update-libtool-ltmain-script.full.patch diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch new file mode 100644 index 0000000..d32e570 --- /dev/null +++ b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch @@ -0,0 +1,43 @@ +Description: Building expat against system's libxmltok library + Provide support for building expat against the system's libxmltok library. + . + Not reported to upstream as this patch is mainly imported for being compliant + with Debian policy (lintian error: embedded-library). +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2011-12-31 +--- a/nx-X11/lib/expat/Imakefile ++++ b/nx-X11/lib/expat/Imakefile +@@ -19,7 +19,7 @@ + EXPATSRC = $(EXPATTOP)/lib + EXPATINC = $(EXPATTOP)/lib + +-INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I. ++INCLUDES = -I/usr/include/xmltok -I/usr/local/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I. + + /* + * Endianness (for short's) +@@ -31,8 +31,8 @@ + DEFINES = -DXML_BYTE_ORDER=0 -DX_BYTE_ORDER=$(X_BYTE_ORDER) + REQUIREDLIBS=$(LDPRELIBS) + +-SRCS = xmlparse.c xmltok.c xmlrole.c +-OBJS = xmlparse.o xmltok.o xmlrole.o ++#SRCS = xmlparse.c xmltok.c xmlrole.c ++#OBJS = xmlparse.o xmltok.o xmlrole.o + + HEADERS = expat.h + +@@ -45,9 +45,9 @@ + + DependTarget() + +-LinkSourceFile(xmlparse.c,$(EXPATSRC)) +-LinkSourceFile(xmltok.c,$(EXPATSRC)) +-LinkSourceFile(xmlrole.c,$(EXPATSRC)) ++#LinkSourceFile(xmlparse.c,$(EXPATSRC)) ++#LinkSourceFile(xmltok.c,$(EXPATSRC)) ++#LinkSourceFile(xmlrole.c,$(EXPATSRC)) + LinkSourceFile(expat.h,$(EXPATINC)) + + diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch deleted file mode 100644 index bd0c72a..0000000 --- a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Building expat against system's libxmltok library - Provide support for building expat against the system's libxmltok library. - . - Not reported to upstream as this patch is mainly imported for being compliant - with Debian policy (lintian error: embedded-library). -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nx-X11/lib/expat/Imakefile -+++ b/nx-X11/lib/expat/Imakefile -@@ -19,7 +19,7 @@ - EXPATSRC = $(EXPATTOP)/lib - EXPATINC = $(EXPATTOP)/lib - --INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I. -+INCLUDES = -I/usr/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I. - - /* - * Endianness (for short's) -@@ -31,8 +31,8 @@ - DEFINES = -DXML_BYTE_ORDER=0 -DX_BYTE_ORDER=$(X_BYTE_ORDER) - REQUIREDLIBS=$(LDPRELIBS) - --SRCS = xmlparse.c xmltok.c xmlrole.c --OBJS = xmlparse.o xmltok.o xmlrole.o -+#SRCS = xmlparse.c xmltok.c xmlrole.c -+#OBJS = xmlparse.o xmltok.o xmlrole.o - - HEADERS = expat.h - -@@ -45,9 +45,9 @@ - - DependTarget() - --LinkSourceFile(xmlparse.c,$(EXPATSRC)) --LinkSourceFile(xmltok.c,$(EXPATSRC)) --LinkSourceFile(xmlrole.c,$(EXPATSRC)) -+#LinkSourceFile(xmlparse.c,$(EXPATSRC)) -+#LinkSourceFile(xmltok.c,$(EXPATSRC)) -+#LinkSourceFile(xmlrole.c,$(EXPATSRC)) - LinkSourceFile(expat.h,$(EXPATINC)) - - diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch new file mode 100644 index 0000000..daee69d --- /dev/null +++ b/debian/patches/020_add-nxagent-wrapper.full.patch @@ -0,0 +1,28 @@ +--- /dev/null ++++ b/bin/nxagent +@@ -0,0 +1,25 @@ ++#!/bin/bash ++ ++# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> ++# ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see http://www.gnu.org/licenses/. ++ ++NX_LIBS=/usr/lib/nx ++NX_LOCAL_LIBS=/usr/local/lib/nx ++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH ++ ++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS ++export LD_LIBRARY_PATH ++ ++exec $NX_LIBS/nxagent "$@" diff --git a/debian/patches/020_add-nxagent-wrapper.patch b/debian/patches/020_add-nxagent-wrapper.patch deleted file mode 100644 index 93eb92a..0000000 --- a/debian/patches/020_add-nxagent-wrapper.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /dev/null -+++ b/bin/nxagent -@@ -0,0 +1,24 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see http://www.gnu.org/licenses/. -+ -+NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH -+ -+export NX_LIBS -+export LD_LIBRARY_PATH -+ -+exec /usr/lib/nx/nxagent "$@" diff --git a/debian/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch new file mode 100644 index 0000000..6e3ea83 --- /dev/null +++ b/debian/patches/021_add-nxauth-wrapper.full.patch @@ -0,0 +1,28 @@ +--- /dev/null ++++ b/bin/nxauth +@@ -0,0 +1,25 @@ ++#!/bin/bash ++ ++# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> ++# ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see http://www.gnu.org/licenses/. ++ ++NX_LIBS=/usr/lib/nx ++NX_LOCAL_LIBS=/usr/local/lib/nx ++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH ++ ++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS ++export LD_LIBRARY_PATH ++ ++exec $NX_LIBS/nxauth "$@" diff --git a/debian/patches/021_add-nxauth-wrapper.patch b/debian/patches/021_add-nxauth-wrapper.patch deleted file mode 100644 index ce51ea8..0000000 --- a/debian/patches/021_add-nxauth-wrapper.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /dev/null -+++ b/bin/nxauth -@@ -0,0 +1,24 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see http://www.gnu.org/licenses/. -+ -+NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH -+ -+export NX_LIBS -+export LD_LIBRARY_PATH -+ -+exec /usr/lib/nx/nxauth "$@" diff --git a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch new file mode 100644 index 0000000..df603fd --- /dev/null +++ b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch @@ -0,0 +1,28 @@ +--- /dev/null ++++ b/bin/nxproxy +@@ -0,0 +1,25 @@ ++#!/bin/bash ++ ++# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> ++# ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see http://www.gnu.org/licenses/. ++ ++NX_LIBS=/usr/lib/nx ++NX_LOCAL_LIBS=/usr/local/lib/nx ++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH ++ ++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS ++export LD_LIBRARY_PATH ++ ++exec $NX_LIBS/nxproxy "$@" diff --git a/debian/patches/022_add-nxproxy-wrapper.patch b/debian/patches/022_add-nxproxy-wrapper.patch deleted file mode 100644 index cedfde3..0000000 --- a/debian/patches/022_add-nxproxy-wrapper.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /dev/null -+++ b/bin/nxproxy -@@ -0,0 +1,24 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see http://www.gnu.org/licenses/. -+ -+NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH -+ -+export NX_LIBS -+export LD_LIBRARY_PATH -+ -+exec /usr/lib/nx/nxproxy "$@" diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch new file mode 100644 index 0000000..d23d3f0 --- /dev/null +++ b/debian/patches/023_add-x2goagent-wrapper.full.patch @@ -0,0 +1,28 @@ +--- /dev/null ++++ b/bin/x2goagent +@@ -0,0 +1,25 @@ ++#!/bin/bash ++ ++# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> ++# ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see http://www.gnu.org/licenses/. ++ ++NX_LIBS=/usr/lib/nx ++NX_LOCAL_LIBS=/usr/local/lib/nx ++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH ++ ++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS ++export LD_LIBRARY_PATH ++ ++exec $NX_LIBS/../x2go/x2goagent "$@" diff --git a/debian/patches/101_nxagent_set-rgb-path.full.patch b/debian/patches/101_nxagent_set-rgb-path.full.patch new file mode 100644 index 0000000..793b19d --- /dev/null +++ b/debian/patches/101_nxagent_set-rgb-path.full.patch @@ -0,0 +1,19 @@ +Description: FHS path fix for rgb file + This patch is needed on Debian only, not reporting this path + addition to upstream. + . + Originally contributed by Marcelo Boveto Shima <marceloshima(a)gmail.com>. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2012-01-12 +--- a/nx-X11/programs/Xserver/os/oscolor.c ++++ b/nx-X11/programs/Xserver/os/oscolor.c +@@ -53,7 +53,7 @@ + #include <sys/stat.h> + #include <unistd.h> + +-static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; ++static char* nxAltRgbPaths[] = {"/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; + static char _NXRgbPath[1024]; + + #endif diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.patch deleted file mode 100644 index b77348c..0000000 --- a/debian/patches/101_nxagent_set-rgb-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: FHS path fix for rgb file - This patch is needed on Debian only, not reporting this path - addition to upstream. - . - Originally contributed by Marcelo Boveto Shima <marceloshima(a)gmail.com>. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/os/oscolor.c -+++ b/nx-X11/programs/Xserver/os/oscolor.c -@@ -53,7 +53,7 @@ - #include <sys/stat.h> - #include <unistd.h> - --static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+static char* nxAltRgbPaths[] = {"/usr/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; - static char _NXRgbPath[1024]; - - #endif diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch new file mode 100644 index 0000000..0d11f2f --- /dev/null +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch @@ -0,0 +1,19 @@ +Description: FHS path fix for SecurityPolicy file + This patch is needed on Debian only, not reporting this path + change to upstream. + . + Originally contributed by Marcelo Boveto Shima <marceloshima(a)gmail.com>. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2012-01-12 +--- a/nx-X11/programs/Xserver/Xext/security.c ++++ b/nx-X11/programs/Xserver/Xext/security.c +@@ -86,7 +86,7 @@ + + #ifdef NXAGENT_SERVER + +-#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" ++#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" + + #endif + diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch new file mode 100644 index 0000000..9d27a37 --- /dev/null +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch @@ -0,0 +1,19 @@ +Description: FHS path fix for SecurityPolicy file + This patch is needed for Tarball installation mode of NX (redistributed) + only, not reporting this path change to upstream. + . + Originally contributed by Marcelo Boveto Shima <marceloshima(a)gmail.com>. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2012-01-12 +--- a/nx-X11/programs/Xserver/Xext/security.c ++++ b/nx-X11/programs/Xserver/Xext/security.c +@@ -86,7 +86,7 @@ + + #ifdef NXAGENT_SERVER + +-#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy" ++#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" + + #endif + diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch deleted file mode 100644 index 4f43eeb..0000000 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: FHS path fix for SecurityPolicy file - This patch is needed on Debian only, not reporting this path - change to upstream. - . - Originally contributed by Marcelo Boveto Shima <marceloshima(a)gmail.com>. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/Xext/security.c -+++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -86,7 +86,7 @@ - - #ifdef NXAGENT_SERVER - --#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy" -+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" - - #endif - diff --git a/debian/patches/103_nxagent_set-X0-config-path.full.patch b/debian/patches/103_nxagent_set-X0-config-path.full.patch new file mode 100644 index 0000000..eb705ca --- /dev/null +++ b/debian/patches/103_nxagent_set-X0-config-path.full.patch @@ -0,0 +1,40 @@ +Description: FHS path fix for keyboard config file + This patch is needed for Tarball installation and on Distros like + Debian, not reporting this path addition to upstream. + . + Originally contributed by FreeNX Team. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Last-Update: 2011-12-31 +--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +@@ -136,7 +136,7 @@ + #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" + #endif + #ifndef XKB_CONFIG_FILE +-#define XKB_CONFIG_FILE "X0-config.keyboard" ++#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" + #endif + #ifndef XKB_DFLT_RULES_FILE + #define XKB_DFLT_RULES_FILE "xfree86" +@@ -985,8 +985,7 @@ + + XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); + +- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) + +- strlen(XKB_CONFIG_FILE) + 1; ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); + + nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); + +@@ -995,9 +994,7 @@ + FatalError("nxagentKeyboardProc: malloc failed."); + } + +- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory); +- strcat(nxagentXkbConfigFilePath, "/"); +- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); ++ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); + + #ifdef TEST + fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", diff --git a/debian/patches/103_nxagent_set-X0-config-path.patch b/debian/patches/103_nxagent_set-X0-config-path.patch deleted file mode 100644 index 485f5fd..0000000 --- a/debian/patches/103_nxagent_set-X0-config-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: FHS path fix for keyboard config file - This patch is needed on Debian only, not reporting this path - addition to upstream. - . - Originally contributed by FreeNX Team. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -@@ -136,7 +136,7 @@ - #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" - #endif - #ifndef XKB_CONFIG_FILE --#define XKB_CONFIG_FILE "X0-config.keyboard" -+#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" - #endif - #ifndef XKB_DFLT_RULES_FILE - #define XKB_DFLT_RULES_FILE "xfree86" -@@ -985,8 +985,7 @@ - - XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); - -- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) + -- strlen(XKB_CONFIG_FILE) + 1; -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); - - nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); - -@@ -995,9 +994,7 @@ - FatalError("nxagentKeyboardProc: malloc failed."); - } - -- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory); -- strcat(nxagentXkbConfigFilePath, "/"); -- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); -+ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); - - #ifdef TEST - fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch similarity index 100% rename from debian/patches/105_nxagent_export-remote-keyboard-config.patch rename to debian/patches/105_nxagent_export-remote-keyboard-config.full.patch diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch similarity index 100% rename from debian/patches/106_nxagent_utf8-copy-clipboard.patch rename to debian/patches/106_nxagent_utf8-copy-clipboard.full.patch diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch similarity index 100% rename from debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch rename to debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch diff --git a/debian/patches/108_nxagent_wine-close-delay.patch b/debian/patches/108_nxagent_wine-close-delay.full.patch similarity index 100% rename from debian/patches/108_nxagent_wine-close-delay.patch rename to debian/patches/108_nxagent_wine-close-delay.full.patch diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch similarity index 100% rename from debian/patches/109_nxagent_locale-utf8-compound-text.patch rename to debian/patches/109_nxagent_locale-utf8-compound-text.full.patch diff --git a/debian/patches/110_nxagent_createpixmap-bounds-check.patch b/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch similarity index 100% rename from debian/patches/110_nxagent_createpixmap-bounds-check.patch rename to debian/patches/110_nxagent_createpixmap-bounds-check.full.patch diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch new file mode 100644 index 0000000..089b570 --- /dev/null +++ b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch @@ -0,0 +1,64 @@ +Description: Detect nxagent/x2goagent flavour + Whether the agent runs in X2Go or NX mode is decide by the + name of the binary that executes the code. + . + Binary name equal to nxagent -> (Free)NX flavour + Binary name equal to x2goagent -> X2Go flavour +Forwarded: not-needed +Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Last-Update: 2012-01-11 +--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c +@@ -178,6 +178,29 @@ + + int nxagentDoFullGeneration = 1; + ++ /* ++ * 1 if agent running as X2goAgent ++ * 0 if NX Agent ++ */ ++int nxagentX2go; ++ ++/* ++ * Checking if agent is x2go agent ++ */ ++ ++void checkX2goAgent() ++{ ++ extern const char *__progname; ++ if( strcasecmp(__progname,"x2goagent") == 0) ++ { ++ fprintf(stderr, "\nrunning as X2Go Agent\n"); ++ nxagentX2go=1; ++ } ++ else ++ nxagentX2go=0; ++} ++ ++ + /* + * Called at X server's initialization. + */ +@@ -194,6 +217,11 @@ + #endif + + /* ++ * Check if we running as X2Go Agent ++ */ ++ checkX2goAgent(); ++ ++ /* + * Print our pid and version information. + */ + +--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h +@@ -37,6 +37,8 @@ + extern int nxagentBackingStore; + extern int nxagentSaveUnder; + ++extern int nxagentX2go; ++ + extern ServerGrabInfoRec nxagentGrabServerInfo; + + #endif /* __Init_H__ */ diff --git a/debian/patches/200_nxagent_unbrand-agent.patch b/debian/patches/200_nxagent_unbrand-agent.patch deleted file mode 100644 index c9aea04..0000000 --- a/debian/patches/200_nxagent_unbrand-agent.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: Unbrand NX Agent Startup Screen - By design this patch is probably not interesting to - NX upstream. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2012-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1754,7 +1754,20 @@ - #ifdef TEST - fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", - nxagentDefaultWindows[pScreen->myNum]); -+ -+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", -+ nxagentDefaultWindows[pScreen->myNum]); - #endif -+ -+ XClassHint hint; -+ hint.res_name=malloc(strlen(HINT)+1); -+ hint.res_class=malloc(strlen(HINT)+1); -+ strcpy(hint.res_name,HINT); -+ strcpy(hint.res_class,HINT); -+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); -+ free(hint.res_name); -+ free(hint.res_class); -+ - - if (nxagentOption(Fullscreen)) - { ---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h -@@ -36,6 +36,8 @@ - #define MIN_NXAGENT_HEIGHT 60 - #define NXAGENT_FRAME_WIDTH 2000 - -+#define HINT "NXAgent" -+ - #define nxagentSetPrintGeometry(screen) \ - nxagentPrintGeometryFlags = (1 << (screen)); - ---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c -@@ -204,6 +204,7 @@ - - nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth); - -+ return; - if (!nxagentPixmapLogo) - { - return; ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -1919,7 +1919,7 @@ - XlibPixmap IconPixmap; - XlibPixmap IconShape; - -- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); -+ snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME); - - if ((icon_fp = fopen(default_path, "r")) == NULL) - { diff --git a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch new file mode 100644 index 0000000..ff3861d --- /dev/null +++ b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch @@ -0,0 +1,220 @@ +Description: X2Go icon when run with x2goagent flavour + Depending on the binary name of the agent either nxagent.xpm + or x2go.xpm is used as window icon. +Forwarded: not-needed +Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Last-Update: 2012-01-11 +--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c 2012-01-11 10:09:05.000000000 +0100 ++++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c 2012-01-11 12:28:11.000000000 +0100 +@@ -77,6 +77,7 @@ is" without express or implied warranty. + #include "NXlib.h" + + #include NXAGENT_ICON_NAME ++#include X2GOAGENT_ICON_NAME + + /* + * Set here the required log level. +@@ -1918,12 +1919,29 @@ Bool nxagentMakeIcon(Display *display, P + Bool success = False; + XlibPixmap IconPixmap; + XlibPixmap IconShape; ++ char* agent_icon_name; ++ char* agentIconData; + +- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); ++ /* ++ * selecting x2go icon when running as X2Go agent ++ */ ++ if(nxagentX2go) ++ { ++ agent_icon_name=X2GOAGENT_ICON_NAME; ++ agentIconData=x2goagentIconData; ++ } ++ else ++ { ++ agent_icon_name=NXAGENT_ICON_NAME; ++ agentIconData=nxagentIconData; ++ } ++ ++ ++ snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", agent_icon_name); + + if ((icon_fp = fopen(default_path, "r")) == NULL) + { +- icon_fp = nxagentLookForIconFile(NXAGENT_ICON_NAME, "r", icon_path); ++ icon_fp = nxagentLookForIconFile(agent_icon_name, "r", icon_path); + + if (icon_fp != NULL) + { +@@ -1962,7 +1980,7 @@ Bool nxagentMakeIcon(Display *display, P + { + status = XpmCreatePixmapFromData(display, + DefaultRootWindow(display), +- nxagentIconData, ++ agentIconData, + &IconPixmap, + &IconShape, + NULL); +--- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h 2012-01-11 10:09:05.000000000 +0100 ++++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h 2012-01-11 12:17:21.000000000 +0100 +@@ -24,6 +24,8 @@ + + #define NXAGENT_ICON_NAME "nxagent.xpm" + ++#define X2GOAGENT_ICON_NAME "x2go.xpm" ++ + #define NXAGENT_PLACEHOLDER_NAME "nxmissing.xpm" + + #endif /* __Icons_H__ */ +--- a/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm 2012-01-11 12:26:24.000000000 +0100 +@@ -0,0 +1,148 @@ ++/* XPM */ ++static char *x2goagentIconData[]={ ++"128 128 17 1", ++". c None", ++"m c #323232", ++"l c #323232", ++"f c #323232", ++"e c #323232", ++"o c #323232", ++"# c #323232", ++"h c #323232", ++"i c #323232", ++"n c #323232", ++"d c #323232", ++"a c #323232", ++"g c #323232", ++"j c #323232", ++"b c #323232", ++"k c #323232", ++"c c #323232", ++".....#abccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbde.....", ++"...fbccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgf...", ++"..#ccccaheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeijccckf..", ++".ecccgl..................................................................................................................ejcckf.", ++".bccd.....................................................................................................................mdccg.", ++"#cca.......................................................................................................................mjcce", ++"gckm........................................................................................................................eccd", ++"ccn..........................................................................................................................jcb", ++"cce..........................................................................................................................icc", ++"ccm..........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc............................................meeee..........................................................................ecc", ++"cc.........eeeeeeeeoiiiiiiiinggggggggjccccccccccccc....#ggggggggggggggggggggggggggggf.............ggggggggggggggggggggggf....ecc", ++"cc....meeeeoiiiiiiiinggggggggjccccccccccccccccccccc....icccccccccccccccccccccccccccce.............cccccccccccccccccccccce....ecc", ++"cc....................................meeeeeeeeoiii....icccccccccccccccccccccccccccce.............cccccccccccccccccccccce....ecc", ++"cc.......................................................menbccccccccccccccccccbhe..................logccccccccccccghe.......ecc", ++"cc...........................................................iccccccccccccccccdm.......................#cccccccccke..........ecc", ++"cc..............................................lee...........#cccccccccccccckm.........................jccccccckm...........ecc", ++"cc........feeeeeeeeoiiiiiiiiiaggggggggjcccccccccccc............icccccccccccccd..........................icccccccf............ecc", ++"cc....meeeeeoiiiiiiiinggggggggjcccccccccccccccccccciiiiii#m.....jcccccccccccci..........................icccccci.............ecc", ++"cc......................................eeeeeeeeeiiiiiiiiigl....eccccccccccccd..........................dcccccj..............ecc", ++"cc...............................................................dcccccccccccj..........................bccccce..............ecc", ++"cc...............................................................lccccccccccccl........................lccccca...............ecc", ++"cc.............................................meeeeeeee#iiiie....dccccccccccch........................icccccl...............ecc", ++"cc.........meeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccb....ecccccccccccb........................bccccn................ecc", ++"cc....meeeeiiiiiiiiiaggggggggbcccccccccccccccccccccccccccccccc#....gccccccccccco......................#cccckm................ecc", ++"cc....................................meeeeeeeeeiiiiiiiiiaggggd....#cccccccccccg......................bcccci.................ecc", ++"cc..................................................................bcccccccccccf....................#cccckm.................ecc", ++"cc..................................................................hcccccccccccd...................mkcccci..................ecc", ++"cc............................................meeeeeeeeoiiiiiiiil...mkcccccccccccl..................icccckm..................ecc", ++"cc.........eeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccccccn....dccccccccccci.................mkcccci...................ecc", ++"cc....meeeeeiiiiiiiiiaggggggggbccccccccccccccccccccccccccccccccckm...lccccccccccck.................icccckm...................ecc", ++"cc.....................................leeeeeeeeoiiiiiiiiigggggggo....accccccccccc#...............mkcccch....................ecc", ++"cc....................................................................ecccccccccccb...............iccccb.....................ecc", ++"cc.....................................................................jccccccccccce.............mkcccc#.....................ecc", ++"cc.............................................meeeeeeeeehiiiiiiii#....#ccccccccccca.............nccccb......................ecc", ++"cc........feeeeeeee#iiiiiiiiigggggggggkccccccccccccccccccccccccccccl....kcccccccccccl...........lccccc#......................ecc", ++"cc....meeeeeoiiiiiiiiigggggggggkcccccccccccccccccccccccccccccccccccd....icccccccccccd...........dccccb.......................ecc", ++"cc......................................leeeeeeeeoiiiiiiiingggggggga....mccccccccccckm.........lccccc#.......................ecc", ++"cc.......................................................................dccccccccccch.........dccccb........................ecc", ++"cc.......................................................................lcccccccccccb........lccccc#........................ecc", ++"cc.............................................meeeeeeeeoiiiiiiiingggo....gccccccccccc#.......dccccg.........................ecc", ++"cc.........meeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccccccccccg....occcccccccccg......lccccce.........................ecc", ++"cc....meeeeiiiiiiiiiaggggggggbcccccccccccccccccccccccccccccccccccccccce....bccccccccccce.....gccccg..........................ecc", ++"cc....................................meeeeeeeeeiiiiiiiiigggggggggkcccd....#cccccccccccd....eccccce..........................ecc", ++"cc.........................................................................mkcccccccccccl...gccccg...........................ecc", ++"cc..........................................................................nccccccccccci..eccccce...........................ecc", ++"cc............................................meeeeeeeeoiiiiiiiingggggggm...lccccccccccckm.gccccg............................ecc", ++"cc.........eeeeeeeeoiiiiiiiinggggggggjcccccccccccccccccccccccccccccccccc#....dccccccccccc#eccccce............................ecc", ++"cc....meeeeeiiiiiiiiiaggggggggkcccccccccccccccccccccccccccccccccccccccccb....ecccccccccccbgccccg.............................ecc", ++"cc.....................................leeeeeeeeoiiiiiiiiigggggggggkccccco....gccccccccccccccccl.............................ecc", ++"cc............................................................................#cccccccccccccccd..............................ecc", ++"cc.............................................................................bccccccccccccccl..............................ecc", ++"cc.............................................leeeeeeeeeiiiiiiiiiagggggggi....icccccccccccccd...............................ecc", ++"cc........feeeeeeee#iiiiiiiingggggggggkccccccccccccccccccccccccccccccccccckm...mkccccccccccccl...............................ecc", ++"cc....meeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccccccccccci....dccccccccccca................................ecc", ++"cc......................................leeeeeeeeoiiiiiiiiigggggggggccccccck....lccccccccccckm...............................ecc", ++"cc...............................................................................accccccccccc#...............................ecc", ++"cc...............................................................................ecccccccccccb...............................ecc", ++"cc............................................leeeeeeeeeiiiiiiiiiaggggggggbcce....bccccccccccce..............................ecc", ++"cc.......feeeeeeee#iiiiiiiiigggggggggkcccccccccccccccccccccccccccccccccccccccd....#cccccccccccg..............................ecc", ++"cc....meeeeeeoiiiiiiiingggggggggccccccccccccccccccccccccccccccccccccccccccccccl....kcccccccccccl.............................ecc", ++"cc.......................................feeeeeeeehiiiiiiiidggggggggbccccccccci....ncccccccccccd.............................ecc", ++"cc...........................................................................mm....bccccccccccccm............................ecc", ++"cc................................................................................#ccccccccccccci............................ecc", ++"cc..........................................leeeeeeee#iiiiiiiidggggggggbcccccl....bccccccccccccck............................ecc", ++"cc......feeeeeeeehiiiiiiiiaggggggggkccccccccccccccccccccccccccccccccccccccccd....#ccccccccccccccc#...........................ecc", ++"cc....meeeeeee#iiiiiiiidggggggggjcccccccccccccccccccccccccccccccccccccccccccl....bcccccccccccccccb...........................ecc", ++"cc.......................................meeeeeeeeeiiiiiiiiigggggggggkcccccd....#cccccbccccccccccce..........................ecc", ++"cc..............................................................................bccccdhcccccccccccg..........................ecc", ++"cc.............................................................................#ccccclmkcccccccccccl.........................ecc", ++"cc..........................................meeeeeeeeeiiiiiiiiiaggggggggbkm....bccccd..ncccccccccccd.........................ecc", ++"cc.....leeeeeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccccci....hcccckl..lccccccccccccm........................ecc", ++"cc....meeeeeeeehiiiiiiiidggggggggbcccccccccccccccccccccccccccccccccccccckm...mkcccci....dccccccccccci........................ecc", ++"cc........................................leeeeeeee#iiiiiiiinggggggggjcci....icccckm....eccccccccccck........................ecc", ++"cc..........................................................................mkcccci......gccccccccccc#.......................ecc", ++"cc..........................................................................icccckm......#cccccccccccb.......................ecc", ++"cc.........................................leeeeeeeeoiiiiiiiiigggggggga....mkcccci........bccccccccccce......................ecc", ++"cc....meeeeeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccci....icccckm........hcccccccccccg......................ecc", ++"cc.....feeeeeeeehiiiiiiiiaggggggggkcccccccccccccccccccccccccccccccccckm...mkcccci.........mkcccccccccccl.....................ecc", ++"cc.........................................feeeeeeeehiiiiiiiiagggggggh....icccckm..........icccccccccccd.....................ecc", ++"cc.......................................................................mkcccci...........lccccccccccccm....................ecc", ++"cc.......................................................................icccckm............dccccccccccci....................ecc", ++"cc...........................................eeeeeeeeehiiiiiiiidggga....mkcccci.............fccccccccccck....................ecc", ++"cc......feeeeeeee#iiiiiiiingggggggggccccccccccccccccccccccccccccccci....iccccb...............gccccccccccc#...................ecc", ++"cc....meeeeeeeoiiiiiiiiigggggggggbcccccccccccccccccccccccccccccccckm...mkcccc#...............occcccccccccb...................ecc", ++"cc........................................meeeeeeeeeiiiiiiiiidgggg#....iccccb.................bccccccccccce..................ecc", ++"cc....................................................................mkcccc#.................#cccccccccccg..................ecc", ++"cc....................................................................iccccb..................mkcccccccccccl.................ecc", ++"cc..........................................eeeeeeeeeiiiiiiiiiaga....mkcccc#...................icccccccccccd.................ecc", ++"cc.....leeeeeeee#iiiiiiiinggggggggjccccccccccccccccccccccccccccci....iccccb....................lccccccccccccm................ecc", ++"cc....meeeeeeee#iiiiiiiiigggggggggkcccccccccccccccccccccccccccckm...mkcccc#.....................dccccccccccci................ecc", ++"cc.........................................leeeeeeeeoiiiiiiiiiah....iccccb......................lccccccccccck................ecc", ++"cc.................................................................mkcccc#.......................gccccccccccc#...............ecc", ++"cc.................................................................dccccj........................ecccccccccccj...............ecc", ++"cc..........................................leeeeeeeeeiiiiiiih....lccccce.........................bccccccccccce..............ecc", ++"cc....meeeeeeeeeiiiiiiiiidgggggggggcccccccccccccccccccccccccci....dccccg..........................#ccccccccccca..............ecc", ++"cc.....feeeeeeeeiiiiiiiinggggggggbcccccccccccccccccccccccccckm...lccccce...........................kcccccccccccl.............ecc", ++"cc........................................leeeeeeeehiiiiiiiih....dccccg............................ncccccccccccd.............ecc", ++"cc..............................................................lccccce............................fccccccccccccf............ecc", ++"cc..............................................................dccccb..............................jcccccccccccg............ecc", ++"cc.........................................meeeeeeeeoiiiiil....lcccccn..............................icccccccccccce...........ecc", ++"cc......feeeeeeeehiiiiiiiigggggggggccccccccccccccccjgggggo.....gccccc#..............................eccccccccccccbm..........ecc", ++"cc....meeeeeeeoiiiiiiiiidgggggggggccccccccccccccccc...........hcccccco...............................cccccccccccccn..........ecc", ++"cc.........................................leeeeeee..........ecccccccn..............................lcccccccccccccc#.........ecc", ++"cc..........................................................#kccccccckf.............................nccccccccccccccc#........ecc", ++"cc........................................................ldcccccccccck#m.........................lncccccccccccccccccdl......ecc", ++"cc.........................................feeeeeee....ogjcccccccccccccccggi..................oggbcccccccccccccccccccccja....ecc", ++"cc.....leeeeeeee#iiiiiiiidggggggggbcccccccccccccccc....icccccccccccccccccccg..................icccccccccccccccccccccccccc....ecc", ++"cc....meeeeeeeehiiiiiiiiaggggggggkccccccccccccccccc....icccccccccccccccccccg..................icccccccccccccccccccccccccc....ecc", ++"cc........................................feeeeeeee..........................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cc...........................................................................................................................ecc", ++"cce..........................................................................................................................hcc", ++"ccn..........................................................................................................................acb", ++"jcb.........................................................................................................................lcca", ++"hcci........................................................................................................................acc#", ++"mkcc#......................................................................................................................dccb.", ++".occci...................................................................................................................macccf.", ++"..#cccbne.............................................................................................................menkccc#..", ++"...okccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbe...", ++"....mhjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccg#....."}; + diff --git a/debian/patches/202_nx-x11_enable-xinerama.full.patch b/debian/patches/202_nx-x11_enable-xinerama.full.patch new file mode 100644 index 0000000..f097f0b --- /dev/null +++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch @@ -0,0 +1,268 @@ +Description: Enable Xinerama support for NX + This patch adds Xinerama awareness to NX agent windows. + . + The advantage of Xinerama awareness is that an NX session window + will only maximize to the dimensions of the active physical + display. +Forwarded: pending +Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Last-Update: 2012-01-13 +--- a/nx-X11/config/cf/host.def ++++ b/nx-X11/config/cf/host.def +@@ -686,7 +686,7 @@ + * + #define BuildXinerama NO + */ +-#define BuildXinerama NO ++#define BuildXinerama YES + + /* + * If you don't want to build support for the GLX extension, uncomment this. +--- a/nx-X11/config/cf/X11.tmpl ++++ b/nx-X11/config/cf/X11.tmpl +@@ -456,7 +456,7 @@ + #define BuildXinerama NO + #endif + #ifndef BuildXineramaLibrary +-#define BuildXineramaLibrary (BuildXinerama && !BuildServersOnly) ++#define BuildXineramaLibrary (BuildXinerama) + #endif + #ifndef BuildDmxDevelTools + #define BuildDmxDevelTools NO +--- a/nx-X11/lib/Xinerama/Xinerama.c ++++ b/nx-X11/lib/Xinerama/Xinerama.c +@@ -249,6 +249,9 @@ + xXineramaIsActiveReq *req; + XExtDisplayInfo *info = find_display (dpy); + ++ ++ return True; ++ + if(!XextHasExtension(info)) + return False; /* server doesn't even have the extension */ + +@@ -279,39 +282,72 @@ + xXineramaQueryScreensReq *req; + XineramaScreenInfo *scrnInfo = NULL; + +- PanoramiXCheckExtension (dpy, info, 0); ++ int i; ++ int x,y,w,h; ++ FILE* fptr; ++ if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))==NULL) { ++ PanoramiXCheckExtension (dpy, info, 0); ++ LockDisplay (dpy); ++ GetReq (XineramaQueryScreens, req); ++ req->reqType = info->codes->major_opcode; ++ req->panoramiXReqType = X_XineramaQueryScreens; ++ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { ++ UnlockDisplay (dpy); ++ SyncHandle (); ++ return NULL; ++ } ++ if(rep.number) { ++ if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * rep.number))) { ++ xXineramaScreenInfo scratch; ++ int i; ++ ++ for(i = 0; i < rep.number; i++) { ++ _XRead(dpy, (char*)(&scratch), sz_XineramaScreenInfo); ++ scrnInfo[i].screen_number = i; ++ scrnInfo[i].x_org = scratch.x_org; ++ scrnInfo[i].y_org = scratch.y_org; ++ scrnInfo[i].width = scratch.width; ++ scrnInfo[i].height = scratch.height; ++ } ++ ++ *number = rep.number; ++ } else { ++ _XEatData(dpy, rep.length << 2); ++ } ++ } + +- LockDisplay (dpy); +- GetReq (XineramaQueryScreens, req); +- req->reqType = info->codes->major_opcode; +- req->panoramiXReqType = X_XineramaQueryScreens; +- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { + UnlockDisplay (dpy); + SyncHandle (); +- return NULL; +- } + +- if(rep.number) { +- if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * rep.number))) { +- xXineramaScreenInfo scratch; +- int i; +- +- for(i = 0; i < rep.number; i++) { +- _XRead(dpy, (char*)(&scratch), sz_XineramaScreenInfo); +- scrnInfo[i].screen_number = i; +- scrnInfo[i].x_org = scratch.x_org; +- scrnInfo[i].y_org = scratch.y_org; +- scrnInfo[i].width = scratch.width; +- scrnInfo[i].height = scratch.height; +- } ++ } else { + +- *number = rep.number; +- } else +- _XEatData(dpy, rep.length << 2); ++ i=0; ++ while(!feof(fptr)) { ++ w=h=0; ++ fscanf(fptr,"%d %d %d %d",&x,&y,&w,&h); ++ if(w&&h) ++ i++; ++ } ++ rewind(fptr); ++ *number=i; ++ if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * i))) { ++ i=0; ++ while(!feof(fptr)){ ++ w=h=0; ++ fscanf(fptr,"%d %d %d %d",&x,&y,&w,&h); ++ if(w&&h){ ++ scrnInfo[i].screen_number=i; ++ scrnInfo[i].x_org=x; ++ scrnInfo[i].y_org=y; ++ scrnInfo[i].width=w; ++ scrnInfo[i].height=h; ++ i++; ++ } ++ } ++ } ++ fclose(fptr); + } + +- UnlockDisplay (dpy); +- SyncHandle (); + return scrnInfo; + } + +--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile ++++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile +@@ -206,7 +206,7 @@ + -UNX_DEBUG_INPUT \ + -DRANDR_10_INTERFACE \ + -DRANDR_12_INTERFACE \ +- -UPANORAMIX \ ++ -DPANORAMIX \ + -UDEBUG_TREE + + all:: $(OBJS) +--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c +@@ -275,17 +275,19 @@ + case xv_PutVideo: + #ifdef PANORAMIX + if(!noPanoramiXExtension) +- result = (XineramaXvPutVideo(client)); break; ++ result = (XineramaXvPutVideo(client)); + else + #endif +- result = (ProcXvPutVideo(client)); break; ++ result = (ProcXvPutVideo(client)); ++ break; + case xv_PutStill: + #ifdef PANORAMIX + if(!noPanoramiXExtension) +- result = (XineramaXvPutStill(client)); break ++ result = (XineramaXvPutStill(client)); + else + #endif +- result = (ProcXvPutStill(client)); break; ++ result = (ProcXvPutStill(client)); ++ break; + case xv_GetVideo: result = (ProcXvGetVideo(client)); break; + case xv_GetStill: result = (ProcXvGetStill(client)); break; + case xv_GrabPort: result = (ProcXvGrabPort(client)); break; +@@ -295,35 +297,39 @@ + case xv_StopVideo: + #ifdef PANORAMIX + if(!noPanoramiXExtension) +- result = (XineramaXvStopVideo(client)); break; ++ result = (XineramaXvStopVideo(client)); + else + #endif +- result = (ProcXvStopVideo(client)); break; ++ result = (ProcXvStopVideo(client)); ++ break; + case xv_SetPortAttribute: + #ifdef PANORAMIX + if(!noPanoramiXExtension) +- result = (XineramaXvSetPortAttribute(client)); break; ++ result = (XineramaXvSetPortAttribute(client)); + else + #endif +- result = (ProcXvSetPortAttribute(client)); break; ++ result = (ProcXvSetPortAttribute(client)); ++ break; + case xv_GetPortAttribute: result = (ProcXvGetPortAttribute(client)); break; + case xv_QueryBestSize: result = (ProcXvQueryBestSize(client)); break; + case xv_QueryPortAttributes: result = (ProcXvQueryPortAttributes(client)); break; + case xv_PutImage: + #ifdef PANORAMIX + if(!noPanoramiXExtension) +- result = (XineramaXvPutImage(client)); break; ++ result = (XineramaXvPutImage(client)); + else + #endif +- result = (ProcXvPutImage(client)); break; ++ result = (ProcXvPutImage(client)); ++ break; + #ifdef MITSHM + case xv_ShmPutImage: + #ifdef PANORAMIX + if(!noPanoramiXExtension) +- result = (XineramaXvShmPutImage(client)); break; ++ result = (XineramaXvShmPutImage(client)); + else + #endif +- result = (ProcXvShmPutImage(client)); break; ++ result = (ProcXvShmPutImage(client)); ++ break; + #endif + case xv_QueryImageAttributes: result = (ProcXvQueryImageAttributes(client)); break; + case xv_ListImageFormats: result = (ProcXvListImageFormats(client)); break; +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1021,7 +1021,7 @@ + #else + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama + #endif + + #endif +--- a/nx-X11/programs/Xserver/Xext/panoramiX.c ++++ b/nx-X11/programs/Xserver/Xext/panoramiX.c +@@ -1045,16 +1045,7 @@ + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +-#if 1 +- { +- /* The following hack fools clients into thinking that Xinerama +- * is disabled even though it is not. */ +- extern Bool PanoramiXExtensionDisabledHack; +- rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack; +- } +-#else + rep.state = !noPanoramiXExtension; +-#endif + if (client->swapped) { + register int n; + swaps (&rep.sequenceNumber, n); +--- a/nx-X11/programs/Xserver/Xext/panoramiX.h ++++ b/nx-X11/programs/Xserver/Xext/panoramiX.h +@@ -44,7 +44,7 @@ + #define _PANORAMIX_H_ + + #include <X11/extensions/panoramiXext.h> +-#include "gcstruct.h" ++/*#include "gcstruct.h"*/ + + + typedef struct _PanoramiXData { diff --git a/debian/patches/209_x2goagent-add-man-page.full.patch b/debian/patches/209_x2goagent-add-man-page.full.patch new file mode 100644 index 0000000..00ade43 --- /dev/null +++ b/debian/patches/209_x2goagent-add-man-page.full.patch @@ -0,0 +1,38 @@ +--- /dev/null ++++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 +@@ -0,0 +1,35 @@ ++.TH x2goagent 1 ++.SH NAME ++x2goagent \- X2Go Agent. ++.SH SYNOPSIS ++.B x2goagent ++.I "[options]" ++ ++.SH DESCRIPTION ++\fBx2goagent\fR is an Xnest-like X server for remote application/desktop access. ++.PP ++\fBx2goagent\fR implements a very efficient compression of the X11 protocol. ++.PP ++This increases performance when using X applications over high latency and ++low bandwidth networks, while providing a local (LAN-like) usage experience ++even if connecting from off-site locations (via cable modem or GSM). ++.PP ++\fBx2goagent\fR is not designed to be used as a standalone application. ++It has to be launched on the server side by the X2Go server software. ++.PP ++Available clients are ++\fBx2goclient\fR, \fBpyhoca-gui\fR and \fBpyhoca-gui\fR (using the ++Python X2Go API). ++ ++.SH OPTIONS ++.TP ++.B \--help ++Lists all others options that are not listed here. ++ ++.SH FURTHER READINGS ++Information on X2Go: http://wiki.x2go.org ++.PP ++Information on NX: http://www.nomachine.com ++ ++.SH AUTHOR ++This manual page was written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/debian/patches/300_nxagent_set-wm-class.full.patch b/debian/patches/300_nxagent_set-wm-class.full.patch new file mode 100644 index 0000000..765d6bc --- /dev/null +++ b/debian/patches/300_nxagent_set-wm-class.full.patch @@ -0,0 +1,60 @@ +Description: Set WM_CLASS to X2GoAgent/NXAgent + Depending on the binary name of the agent either NXAgent + or X2GoAgent is set as WM_Class. + . + This is needed for some window managers (like the one shipped with + Maemo) + . + The original WM_CLASS patch has been taken from the FreeNX patch + series, author unknown. + . + The nxagent/x2goagent has been done by the X2Go Project, author + see below. +Forwarded: not-needed +Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Last-Update: 2012-01-11 +--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c +@@ -1756,6 +1756,42 @@ + nxagentDefaultWindows[pScreen->myNum]); + #endif + ++ /* ++ * Setting WM_CLASS to "X2GoAgent" when running in X2Go Agent mode ++ * we need it to properly display all window parameters by some WMs ++ * (for example on Maemo) ++ */ ++ if(nxagentX2go) ++ { ++ #ifdef TEST ++ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", ++ nxagentDefaultWindows[pScreen->myNum]); ++ #endif ++ XClassHint hint; ++ hint.res_name=malloc(strlen("X2GoAgent")+1); ++ hint.res_class=malloc(strlen("X2GoAgent")+1); ++ strcpy(hint.res_name,"X2GoAgent"); ++ strcpy(hint.res_class,"X2GoAgent"); ++ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); ++ free(hint.res_name); ++ free(hint.res_class); ++ } else { ++ #ifdef TEST ++ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", ++ nxagentDefaultWindows[pScreen->myNum]); ++ #endif ++ ++ XClassHint hint; ++ hint.res_name=malloc(strlen("NXAgent")+1); ++ hint.res_class=malloc(strlen("NXAgent")+1); ++ strcpy(hint.res_name,"NXAgent"); ++ strcpy(hint.res_class,"NXAgent"); ++ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); ++ free(hint.res_name); ++ free(hint.res_class); ++ } ++ ++ + if (nxagentOption(Fullscreen)) + { + nxagentFullscreenWindow = nxagentDefaultWindows[pScreen->myNum]; diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch new file mode 100644 index 0000000..7a5ce54 --- /dev/null +++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch @@ -0,0 +1,296 @@ +Description: Unbrand NX Agent Startup Screen / Brand X2Go Agent Startup Screen + When launched with NX Agent flavour, the startup screen gets unbranded by + this patch (the !M logo does not get shown). + . + When launched with X2Go Agent flavour, the startup screen gets branded + with the X2GO logo. +Forwarded: not-needed +Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Last-Update: 2012-01-11 +--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c +@@ -35,6 +35,7 @@ + #include "Windows.h" + #include "Atoms.h" + #include "Trap.h" ++#include "Init.h" + + /* + * Set here the required log level. +@@ -53,6 +54,7 @@ + int nxagentLogoWhite; + int nxagentLogoRed; + int nxagentLogoBlack; ++int nxagentLogoGray; + + void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height); + +@@ -166,6 +168,15 @@ + XPoint m[12]; + int w, h, c, w2, h2; + ++ /* ++ * Show only X2GO Logo when running as X2Go Agent ++ */ ++ if(! nxagentX2go) ++ { ++ nxagentPixmapLogo = 0L; ++ return; ++ } ++ + #ifdef DEBUG + fprintf(stderr, "nxagenShowtLogo: Got called.\n"); + #endif +@@ -218,75 +229,146 @@ + XSetForeground(nxagentDisplay, gc, nxagentLogoRed); + XSetBackground(nxagentDisplay, gc, nxagentLogoWhite); + +- rect[0].x = w2-10*c; rect[0].y = h2-8*c; +- rect[1].x = w2-10*c; rect[1].y = h2+8*c; +- rect[2].x = w2+10*c; rect[2].y = h2+8*c; +- rect[3].x = w2+10*c; rect[3].y = h2-8*c; ++ /* ++ * Draw X2GO Logo ++ */ + ++ /* ++ * Begin 'X'. ++ */ ++ ++ XSetForeground(nxagentDisplay, gc, nxagentLogoGray); ++ XSetBackground(nxagentDisplay, gc, nxagentLogoWhite); ++ rect[0].x = w2-7*c; rect[0].y = h2-5*c; ++ rect[1].x = w2-8*c; rect[1].y = h2-5*c; ++ rect[2].x = w2-4*c; rect[2].y = h2+3*c; ++ rect[3].x = w2-3*c; rect[3].y = h2+3*c; + XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + +- #ifdef NXAGENT_LOGO_DEBUG +- fprintf(stderr, "filled red rect\n"); +- #endif ++ rect[0].x = w2-4*c; rect[0].y = h2-5*c; ++ rect[1].x = w2-3*c; rect[1].y = h2-5*c; ++ rect[2].x = w2-7*c; rect[2].y = h2+3*c; ++ rect[3].x = w2-8*c; rect[3].y = h2+3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + +- rect[0].x = w2-9*c; rect[0].y = h2-7*c; +- rect[1].x = w2-9*c; rect[1].y = h2+7*c; +- rect[2].x = w2+9*c; rect[2].y = h2+7*c; +- rect[3].x = w2+9*c; rect[3].y = h2-7*c; ++ /* ++ * End 'X'. ++ */ + +- XSetForeground(nxagentDisplay, gc, nxagentLogoWhite); +- XSetBackground(nxagentDisplay, gc, nxagentLogoRed); ++ /* ++ * Start '2'. ++ */ ++ ++ rect[0].x = w2-2*c; rect[0].y = h2-5*c; ++ rect[1].x = w2-1*c; rect[1].y = h2-5*c; ++ rect[2].x = w2-1*c; rect[2].y = h2-3*c; ++ rect[3].x = w2-2*c; rect[3].y = h2-3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); ++ ++ rect[0].x = w2-2*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+2*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+2*c; rect[2].y = h2-4*c; ++ rect[3].x = w2-2*c; rect[3].y = h2-4*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + ++ rect[0].x = w2+1*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+2*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+2*c; rect[2].y = h2-2*c; ++ rect[3].x = w2+1*c; rect[3].y = h2-2*c; + XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + ++ rect[0].x = w2+2*c; rect[0].y = h2-2*c; ++ rect[1].x = w2+1*c; rect[1].y = h2-2*c; ++ rect[2].x = w2-2*c; rect[2].y = h2+2*c; ++ rect[3].x = w2-1*c; rect[3].y = h2+2*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); ++ ++ ++ rect[0].x = w2-2*c; rect[0].y = h2+2*c; ++ rect[1].x = w2+2*c; rect[1].y = h2+2*c; ++ rect[2].x = w2+2*c; rect[2].y = h2+3*c; ++ rect[3].x = w2-2*c; rect[3].y = h2+3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + /* +- * Begin 'M'. ++ * End '2'. + */ + +- m[0].x = w2-3*c; m[0].y = h2-5*c; +- m[1].x = w2+7*c; m[1].y = h2-5*c; +- m[2].x = w2+7*c; m[2].y = h2+5*c; +- m[3].x = w2+5*c; m[3].y = h2+5*c; +- m[4].x = w2+5*c; m[4].y = h2-3*c; +- m[5].x = w2+3*c; m[5].y = h2-3*c; +- m[6].x = w2+3*c; m[6].y = h2+5*c; +- m[7].x = w2+1*c; m[7].y = h2+5*c; +- m[8].x = w2+1*c; m[8].y = h2-3*c; +- m[9].x = w2-1*c; m[9].y = h2-3*c; +- m[10].x = w2-1*c; m[10].y = h2+5*c; +- m[11].x = w2-3*c; m[11].y = h2+5*c; ++ /* ++ * Start 'G'. ++ */ + +- XSetForeground(nxagentDisplay, gc, nxagentLogoRed); +- XSetBackground(nxagentDisplay, gc, nxagentLogoWhite); ++ rect[0].x = w2+3*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+7*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+7*c; rect[2].y = h2-4*c; ++ rect[3].x = w2+3*c; rect[3].y = h2-4*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + +- XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, m, 12, Nonconvex, CoordModeOrigin); ++ rect[0].x = w2+3*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+4*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+4*c; rect[2].y = h2+3*c; ++ rect[3].x = w2+3*c; rect[3].y = h2+3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + ++ rect[0].x = w2+3*c; rect[0].y = h2+2*c; ++ rect[1].x = w2+7*c; rect[1].y = h2+2*c; ++ rect[2].x = w2+7*c; rect[2].y = h2+3*c; ++ rect[3].x = w2+3*c; rect[3].y = h2+3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); ++ ++ rect[0].x = w2+6*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+7*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+7*c; rect[2].y = h2-3*c; ++ rect[3].x = w2+6*c; rect[3].y = h2-3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); ++ ++ rect[0].x = w2+6*c; rect[0].y = h2-0*c; ++ rect[1].x = w2+7*c; rect[1].y = h2-0*c; ++ rect[2].x = w2+7*c; rect[2].y = h2+3*c; ++ rect[3].x = w2+6*c; rect[3].y = h2+3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); ++ ++ rect[0].x = w2+5*c; rect[0].y = h2-1*c; ++ rect[1].x = w2+7*c; rect[1].y = h2-1*c; ++ rect[2].x = w2+7*c; rect[2].y = h2+0*c; ++ rect[3].x = w2+5*c; rect[3].y = h2+0*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + /* +- * End 'M'. ++ * End 'G'. + */ + + /* +- * Begin '!'. ++ * Start 'O'. + */ + +- rect[0].x = w2-7*c; rect[0].y = h2-5*c; +- rect[1].x = w2-5*c; rect[1].y = h2-5*c; +- rect[2].x = w2-5*c; rect[2].y = h2+2*c; +- rect[3].x = w2-7*c; rect[3].y = h2+2*c; ++ rect[0].x = w2+8*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+12*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+12*c; rect[2].y = h2-4*c; ++ rect[3].x = w2+8*c; rect[3].y = h2-4*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + ++ rect[0].x = w2+8*c; rect[0].y = h2+3*c; ++ rect[1].x = w2+12*c; rect[1].y = h2+3*c; ++ rect[2].x = w2+12*c; rect[2].y = h2+2*c; ++ rect[3].x = w2+8*c; rect[3].y = h2+2*c; + XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + +- rect[0].x = w2-7*c; rect[0].y = h2+3*c; +- rect[1].x = w2-5*c; rect[1].y = h2+3*c; +- rect[2].x = w2-5*c; rect[2].y = h2+5*c; +- rect[3].x = w2-7*c; rect[3].y = h2+5*c; ++ rect[0].x = w2+8*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+9*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+9*c; rect[2].y = h2+3*c; ++ rect[3].x = w2+8*c; rect[3].y = h2+3*c; ++ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + ++ rect[0].x = w2+11*c; rect[0].y = h2-5*c; ++ rect[1].x = w2+12*c; rect[1].y = h2-5*c; ++ rect[2].x = w2+12*c; rect[2].y = h2+3*c; ++ rect[3].x = w2+11*c; rect[3].y = h2+3*c; + XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); + + /* +- * End 'M'. ++ * End 'O'. + */ + ++ + XSetWindowBackgroundPixmap(nxagentDisplay, win, nxagentPixmapLogo); + + #ifdef NXAGENT_LOGO_DEBUG +--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c +@@ -1403,22 +1403,10 @@ + g = pV.green_mask; + b = pV.blue_mask; + +- if (!pV.red_mask || !pV.green_mask || !pV.blue_mask) +- { +- nxagentLogoBlack = 0x000000; +- nxagentLogoRed = 0xff0000; +- nxagentLogoWhite = 0xffffff; +- } +- else +- { +- for (or=0, off=0x800000; (r&(off>>or)) == 0; or++); +- for (og=0, off=0x800000; (g&(off>>og)) == 0; og++); +- for (ob=0, off=0x800000; (b&(off>>ob)) == 0; ob++); +- +- nxagentLogoRed = nxagentLogoColor(0xff0000); +- nxagentLogoBlack = nxagentLogoColor(0x000000); +- nxagentLogoWhite = 0xffffff; +- } ++ nxagentLogoBlack = 0x000000; ++ nxagentLogoRed = 0xff0000; ++ nxagentLogoWhite = 0xffffff; ++ nxagentLogoGray = 0x222222; + + #ifdef WATCH + +@@ -2673,22 +2661,10 @@ + g = pV.green_mask; + b = pV.blue_mask; + +- if (!pV.red_mask || !pV.green_mask || !pV.blue_mask) +- { +- nxagentLogoBlack = 0x000000; +- nxagentLogoRed = 0xff0000; +- nxagentLogoWhite = 0xffffff; +- } +- else +- { +- for (or=0, off=0x800000; (r&(off>>or)) == 0; or++); +- for (og=0, off=0x800000; (g&(off>>og)) == 0; og++); +- for (ob=0, off=0x800000; (b&(off>>ob)) == 0; ob++); +- +- nxagentLogoRed = nxagentLogoColor(0xff0000); +- nxagentLogoBlack = nxagentLogoColor(0x000000); +- nxagentLogoWhite = 0xffffff; +- } ++ nxagentLogoBlack = 0x000000; ++ nxagentLogoRed = 0xff0000; ++ nxagentLogoWhite = 0xffffff; ++ nxagentLogoGray = 0x222222; + + useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape); + +--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h +@@ -33,6 +33,7 @@ + extern int nxagentLogoWhite; + extern int nxagentLogoRed; + extern int nxagentLogoBlack; ++extern int nxagentLogoGray; + + extern Window nxagentSplashWindow; + diff --git a/debian/patches/series b/debian/patches/series index a02a19b..d22f4b4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,32 +1,40 @@ -000_add-NX-redistribution-README.patch -001_add-main-makefile.patch -002_nxcompshad_build-against-nx-x11-only.patch -003_nxcompshad_gcc43.patch -004_nx-x11_fix-nxcompshad-build.patch -005_nxcomp_gcc43.patch -007_nxcompshad_clean-gch-files.patch -009_nxproxy-add-man-page.patch -009_nxagent-add-man-page.patch -010_nxauth_fix-binary-name-in-man-page.patch -011_nxcomp_sa-restorer.patch -012_nxcomp_makefile-uninstall.patch -013_nxcompext_makefile-uninstall.patch -014_nxcompshad_makefile-uninstall.patch -015_nxproxy_makefile-uninstall.patch -016_nx-x11_install-location.patch -017_nx-x11_update-autotools-helper-files.patch -018_nx-x11_update-libtool-ltmain-script.patch -019_nx-x11_expat-build-against-system-libxmltok.patch -020_add-nxagent-wrapper.patch -021_add-nxauth-wrapper.patch -022_add-nxproxy-wrapper.patch -101_nxagent_set-rgb-path.patch -102_xserver-xext_set-securitypolicy-path.patch -103_nxagent_set-X0-config-path.patch -105_nxagent_export-remote-keyboard-config.patch -106_nxagent_utf8-copy-clipboard.patch -107_nxagent_clipboard-compound-text+small-bed-sheets.patch -108_nxagent_wine-close-delay.patch -109_nxagent_locale-utf8-compound-text.patch -110_nxagent_createpixmap-bounds-check.patch -200_nxagent_unbrand-agent.patch +000_add-NX-redistribution-README.full+lite.patch +001_add-main-makefile.full+lite.patch +002_nxcompshad_build-against-nx-x11-only.full.patch +003_nxcompshad_gcc43.full.patch +004_nx-x11_fix-nxcompshad-build.full.patch +005_nxcomp_gcc43.full+lite.patch +007_nxcompshad_clean-gch-files.full.patch +009_nxproxy-add-man-page.full+lite.patch +009_nxagent-add-man-page.full.patch +010_nxauth_fix-binary-name-in-man-page.full.patch +012_nxcomp_makefile-uninstall.full+lite.patch +013_nxcompext_makefile-uninstall.full.patch +014_nxcompshad_makefile-uninstall.full.patch +015_nxproxy_makefile-uninstall.full+lite.patch +016_nx-x11_install-location.full.patch +016_nx-X11_install-location.debian.patch +017_nx-x11_update-autotools-helper-files.full.patch +018_nx-x11_update-libtool-ltmain-script.full.patch +019_nx-x11_expat-build-against-system-libxmltok.full.patch +020_add-nxagent-wrapper.full.patch +021_add-nxauth-wrapper.full.patch +022_add-nxproxy-wrapper.full+lite.patch +023_add-x2goagent-wrapper.full.patch +101_nxagent_set-rgb-path.full.patch +102_xserver-xext_set-securitypolicy-path.full.patch +102_xserver-xext_set-securitypolicy-path.debian.patch +103_nxagent_set-X0-config-path.full.patch +105_nxagent_export-remote-keyboard-config.full.patch +106_nxagent_utf8-copy-clipboard.full.patch +107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch +108_nxagent_wine-close-delay.full.patch +109_nxagent_locale-utf8-compound-text.full.patch +110_nxagent_createpixmap-bounds-check.full.patch +200_nxagent_check-binary-x2go-flavour.full.patch +201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch +202_nx-x11_enable-xinerama.full.patch +209_x2goagent-add-man-page.full.patch +300_nxagent_set-wm-class.full.patch +999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch + diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index e390a7d..0aa6a1a 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,3 +1,4 @@ nx-libs source: ancient-autotools-helper-file nx-libs source: outdated-autotools-helper-file nx-libs source: ancient-libtool +nx-libs source: debian-revision-should-not-be-zero diff --git a/debian/x2goagent.dirs b/debian/x2goagent.dirs new file mode 100644 index 0000000..042e97d --- /dev/null +++ b/debian/x2goagent.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/lib/nx +usr/share/x2go \ No newline at end of file diff --git a/debian/x2goagent.install b/debian/x2goagent.install new file mode 100644 index 0000000..8fa8af8 --- /dev/null +++ b/debian/x2goagent.install @@ -0,0 +1,3 @@ +bin/x2goagent usr/bin +debian/rgb usr/share/x2go +nx-X11/programs/Xserver/hw/nxagent/x2go.xpm usr/share/pixmaps \ No newline at end of file diff --git a/debian/x2goagent.links b/debian/x2goagent.links new file mode 100644 index 0000000..48b2ea5 --- /dev/null +++ b/debian/x2goagent.links @@ -0,0 +1 @@ +usr/lib/nx/nxagent usr/lib/x2go/x2goagent diff --git a/debian/x2goagent.lintian-overrides b/debian/x2goagent.lintian-overrides new file mode 100644 index 0000000..9e14206 --- /dev/null +++ b/debian/x2goagent.lintian-overrides @@ -0,0 +1 @@ +x2goagent: debian-revision-should-not-be-zero \ No newline at end of file diff --git a/debian/x2goagent.manpages b/debian/x2goagent.manpages new file mode 100644 index 0000000..2a8850e --- /dev/null +++ b/debian/x2goagent.manpages @@ -0,0 +1 @@ +nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 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

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2012