x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

x2goserver.git - backport-lenny (branch) updated: 3.0.99-2-68-g427cc2d
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, backport-lenny has been updated via 427cc2de770109a62fbeebf5b9b683dc1a35b026 (commit) from 68b954d0b40b8e92cacb50f50a1287a8e4b7e2b7 (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 427cc2de770109a62fbeebf5b9b683dc1a35b026 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 15:20:03 2011 +0200 fix control file ----------------------------------------------------------------------- Summary of changes: debian/control | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 4d3aac1..cd555b4 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,7 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 7), - #debhelper (>= 7.0.50~), - #man2html-base | man2html + man2html Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git 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

buildscripts.git - master (branch) updated: b08d45e3794cb76270ba289fe2e73d1d73dec772
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via b08d45e3794cb76270ba289fe2e73d1d73dec772 (commit) from e4a28490a4ffaec45afeb6c9db9f16e2cd7ec008 (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 b08d45e3794cb76270ba289fe2e73d1d73dec772 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 15:01:25 2011 +0200 make sure we check out new branches from origin ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index cbf3411..3cb6100 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -107,7 +107,7 @@ prepare_workspace() { if [ -d $PROJECT_DIR/.git ]; then cd $PROJECT_DIR && git reset --hard git pull origin $CHECKOUT - git checkout $CHECKOUT || git checkout -b $CHECKOUT + git checkout origin $CHECKOUT || git checkout -b $CHECKOUT else cd $(dirname $PROJECT_DIR) git clone git://code.x2go.org/$PROJECT.git hooks/post-receive -- buildscripts.git (buildscripts upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (buildscripts upstream project).

1 0

x2goserver.git - backport-lenny (branch) created: 3.0.99-2-67-g68b954d
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, backport-lenny has been created at 68b954d0b40b8e92cacb50f50a1287a8e4b7e2b7 (commit) - Log ----------------------------------------------------------------- commit 68b954d0b40b8e92cacb50f50a1287a8e4b7e2b7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 14:52:08 2011 +0200 Debian lenny backport. ----------------------------------------------------------------------- hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - build-main (branch) updated: 3.0.99-2-66-gad9a7e6
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via ad9a7e6f8173f342cdddcc824ef1f15f0c836511 (commit) via ee0b2b616b2764ad2da6ec54de8fce48fce62f51 (commit) via 2a56ff7adae0abc5758938a863269771e65d06d9 (commit) via 4e789a61df7bf41aac49817d1207954ce6cb8688 (commit) via 429cc9fe5fe724b3a6ac166ed39ba7ee1e9afbb6 (commit) via 54f9ba4f953caaf0390ba4df99df471cd5772060 (commit) via 3be6695368cc2d9e522dff419a43426fba03e829 (commit) via 5e65654724f5b9fc9e76260fe4a1ef8182af3b3b (commit) via d64013f1b0ac2d5de341b5acddb29223a1e98e6d (commit) via 9cdeea70167490c2257fc905a7b2364aa4a58e2f (commit) via 62f39bff4dd294f6973c88f5b54eabace85d5b3e (commit) via fc40b4b0365e61dabf9a6a2c16e3ef0a6bbdae6e (commit) via ff6e33487a414ef58c4a7c2fd7ffceba9ecd42b1 (commit) via cf6abd4c1dc2ff5e9536787c4482f16f68816f99 (commit) via a2608a27b8bdf0b0de8685c20bd9009f7a6772a2 (commit) via c5bf55a4811185f286a05ff91283ed5667fd7628 (commit) via d9c027bc304c5131c11e7baa312433dbba7a4cc2 (commit) via d9fbb184b688c5c9dc376e07a8e4ae071fb45d28 (commit) via 45d22a87339986c5e062be733584b8b18aa5cde7 (commit) via eb69e430bdb1f8c6182987e2175ce781156d894f (commit) via 1ac8f38b73abfa302c19e6eebe46335eed88526d (commit) via 550999a270a5c16f04109f84892b9308aab56f3d (commit) via 497cc223f35c5ad935d210d7343baabfa3f411e1 (commit) via f694b1b0ec434427ae98c4bc5bde30de6242d6b9 (commit) via 10090a8827390851fe4c5e6e783ec9ba3c29ee32 (commit) via 693d01c97a19f52c82b4acdd39d02cbfafd541fa (commit) via d26b079a38561d1a047f25660ad647323198475b (commit) via c69ab7501a44bf87d0364767281c369d168d71f0 (commit) via a11d0710319e5a1be3834f1c21c8a1e821a9b9c8 (commit) via c59db1919428a86491645e7d718307c6846d9091 (commit) via d4b7032af631f0dd90bb63a4de9adae194fe5dd0 (commit) via 8e650e2bd0b793d9739dc5080dadc40122f2b0fd (commit) via 99c8a000951ad26707a144d133522af826985149 (commit) via bfe51002d37a5f54a4a7d5febcf1dcdfeca8bd53 (commit) via f64caf3555e6fb2537352174c38c9f94390e0e6d (commit) via 98686e7fdcdda3c0ba05a5188b4d356e1d5a2028 (commit) via f4f840848650204369964d8fc2af52e63ce3086c (commit) via 388c841702a3069d1d3dd07feef44a7bc3b71662 (commit) via 52ae7d0897cbc84f4c297d06dc8e6e56a7862212 (commit) via d1ce5e0052aa77b3d9534d76f7e5948b9de874db (commit) via 96baf09c7c12dad0995a1c9da3f1d950473ef8d0 (commit) via 0cb7b131ffeda0fa2935b3e572a8093088bfb820 (commit) via 208c0cd58c8229b3b5fb3efc2f6e066f4797fab2 (commit) via b7821fd534df524141e7ec1987a13d5f5fcbe58a (commit) via 149ec2a8a73f1f5d7361e5bc37be5ff0df9d05b2 (commit) via 5f357334b50b6d834108bebb8813b6c4f77b05a2 (commit) from d352a2b49a9e2461c21c61df072a12c2042d1a74 (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: INSTALL | 53 +++++++++++ Makefile | 23 +++++ UNINSTALL | 26 +++++ debian/changelog | 36 +++++++- debian/compat | 2 +- debian/control | 94 +++++++++++++++---- debian/copyright | 56 ++++++----- debian/rules | 28 +----- debian/x2goserver-extensions.dirs | 3 + debian/x2goserver-extensions.docs | 1 + debian/x2goserver-extensions.install | 2 + debian/x2goserver-extensions.manpages | 1 + debian/x2goserver.dirs | 6 +- debian/x2goserver.docs | 1 + debian/x2goserver.init | 15 ++- debian/x2goserver.install | 39 +------- debian/x2goserver.manpages | 1 + debian/x2goserver.postinst | 2 +- x2gochangestatus | 11 -- x2gocmdexitmessage | 7 -- x2gocreatesession | 17 ---- x2gogetagent | 8 -- x2gogetdisplays | 9 -- x2gogetports | 9 -- x2gogetservers | 8 -- x2goinsertport | 14 --- x2goinsertsession | 13 --- x2golistdesktops | 53 ----------- x2golistsessions | 61 ------------ x2golistsessions_root | 52 ---------- x2golistsessions_sql | 30 ------ x2goprint | 62 ------------ x2goresume | 11 -- x2goresume-session | 71 -------------- .../html/man8/x2gosetkeyboard.8.html | 61 ++++++++++++ .../.build_man2html/html/man8/x2goversion.8.html | 69 ++++++++++++++ x2goserver-extensions/Makefile | 98 ++++++++++++++++++++ .../VERSION.x2goserver-extensions | 1 + x2goserver-extensions/bin/x2gosetkeyboard | 60 ++++++++++++ x2goserver-extensions/bin/x2goversion | 47 ++++++++++ x2goserver-extensions/man/man8/x2gosetkeyboard.8 | 29 ++++++ x2goserver-extensions/man/man8/x2goversion.8 | 35 +++++++ .../html/man8/x2gocleansessions.8.html | 49 ++++++++++ .../html/man8/x2golistsessions.8.html | 49 ++++++++++ .../.build_man2html/html/man8/x2gomountdirs.8.html | 49 ++++++++++ .../.build_man2html/html/man8/x2goprint.8.html | 49 ++++++++++ .../html/man8/x2goresume-session.8.html | 49 ++++++++++ .../html/man8/x2goruncommand.8.html | 49 ++++++++++ .../html/man8/x2gostartagent.8.html | 49 ++++++++++ .../html/man8/x2gosuspend-session.8.html | 49 ++++++++++ .../html/man8/x2goterminate-session.8.html | 49 ++++++++++ .../html/man8/x2goumount-session.8.html | 49 ++++++++++ .../.build_man2html/html/man8/x2goumount.8.html | 49 ++++++++++ x2goserver/Makefile | 98 ++++++++++++++++++++ x2goserver/VERSION.x2goserver | 1 + x2goserver/bin/x2gochangestatus | 32 +++++++ x2goserver/bin/x2gocmdexitmessage | 26 +++++ x2goserver/bin/x2gocreatesession | 37 ++++++++ x2goserver/bin/x2gogetagent | 29 ++++++ x2goserver/bin/x2gogetdisplays | 29 ++++++ x2goserver/bin/x2gogetports | 29 ++++++ x2goserver/bin/x2gogetservers | 28 ++++++ x2goserver/bin/x2goinsertport | 34 +++++++ x2goserver/bin/x2goinsertsession | 33 +++++++ x2goserver/bin/x2golistdesktops | 74 +++++++++++++++ x2goserver/bin/x2golistsessions | 81 ++++++++++++++++ x2goserver/bin/x2golistsessions_root | 73 +++++++++++++++ x2goserver/bin/x2golistsessions_sql | 49 ++++++++++ x2gomountdirs => x2goserver/bin/x2gomountdirs | 21 ++++ x2goserver/bin/x2goprint | 82 ++++++++++++++++ x2goserver/bin/x2goresume | 31 ++++++ x2goserver/bin/x2goresume-session | 91 ++++++++++++++++++ x2goruncommand => x2goserver/bin/x2goruncommand | 22 ++++- x2goserver/bin/x2gosessionlimit | 97 +++++++++++++++++++ x2goserver/bin/x2goshowblocks | 37 ++++++++ .../bin/x2gosqlitewrapper | 20 ++++ x2gostartagent => x2goserver/bin/x2gostartagent | 20 ++++ x2goserver/bin/x2gosuspend-agent | 30 ++++++ x2goserver/bin/x2gosuspend-session | 43 +++++++++ x2goserver/bin/x2goterminate | 30 ++++++ x2goserver/bin/x2goterminate-session | 36 +++++++ x2goserver/bin/x2goumount | 62 ++++++++++++ .../bin/x2goumount-session | 24 ++++- x2goserver/bin/x2goumount_session | 1 + x2goserver.conf => x2goserver/etc/x2goserver.conf | 0 sql => x2goserver/etc/x2gosql/sql | 0 x2goserver/lib/a.out | Bin 0 -> 6867 bytes x2goserver/lib/setuidwrapper.c | 12 +++ x2goserver/lib/test.py | 9 ++ .../lib/x2godbwrapper.pm | 20 ++++ x2goserver/man/man8/x2gocleansessions.8 | 22 +++++ x2goserver/man/man8/x2golistsessions.8 | 22 +++++ x2goserver/man/man8/x2gomountdirs.8 | 22 +++++ x2goserver/man/man8/x2goprint.8 | 22 +++++ x2goserver/man/man8/x2goresume-session.8 | 22 +++++ x2goserver/man/man8/x2goruncommand.8 | 22 +++++ x2goserver/man/man8/x2gostartagent.8 | 35 +++++++ x2goserver/man/man8/x2gosuspend-session.8 | 22 +++++ x2goserver/man/man8/x2goterminate-session.8 | 22 +++++ x2goserver/man/man8/x2goumount-session.8 | 22 +++++ x2goserver/man/man8/x2goumount.8 | 22 +++++ .../sbin/x2gocleansessions | 27 +++++- x2godbadmin => x2goserver/sbin/x2godbadmin | 20 ++++ x2goserver/share/x2go/versions/VERSION.x2goserver | 1 + x2gosessionlimit | 77 --------------- x2goshowblocks | 17 ---- x2gosuspend-agent | 10 -- x2gosuspend-session | 23 ----- x2goterminate | 9 -- x2goterminate-session | 16 --- x2goumount | 41 -------- 111 files changed, 2856 insertions(+), 745 deletions(-) create mode 100644 INSTALL create mode 100755 Makefile create mode 100644 UNINSTALL create mode 100644 debian/x2goserver-extensions.dirs create mode 100644 debian/x2goserver-extensions.docs create mode 100644 debian/x2goserver-extensions.install create mode 100644 debian/x2goserver-extensions.manpages create mode 100644 debian/x2goserver.docs create mode 100644 debian/x2goserver.manpages mode change 100644 => 100755 debian/x2goserver.postrm delete mode 100755 x2gochangestatus delete mode 100755 x2gocmdexitmessage delete mode 100755 x2gocreatesession delete mode 100755 x2gogetagent delete mode 100755 x2gogetdisplays delete mode 100755 x2gogetports delete mode 100755 x2gogetservers delete mode 100755 x2goinsertport delete mode 100755 x2goinsertsession delete mode 100755 x2golistdesktops delete mode 100755 x2golistsessions delete mode 100755 x2golistsessions_root delete mode 100755 x2golistsessions_sql delete mode 100755 x2goprint delete mode 100755 x2goresume delete mode 100755 x2goresume-session create mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html create mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html create mode 100755 x2goserver-extensions/Makefile create mode 100644 x2goserver-extensions/VERSION.x2goserver-extensions create mode 100755 x2goserver-extensions/bin/x2gosetkeyboard create mode 100755 x2goserver-extensions/bin/x2goversion create mode 100644 x2goserver-extensions/man/man8/x2gosetkeyboard.8 create mode 100644 x2goserver-extensions/man/man8/x2goversion.8 create mode 100644 x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2golistsessions.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2goprint.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2goresume-session.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2goruncommand.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2gostartagent.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2goumount-session.8.html create mode 100644 x2goserver/.build_man2html/html/man8/x2goumount.8.html create mode 100755 x2goserver/Makefile create mode 100644 x2goserver/VERSION.x2goserver create mode 100755 x2goserver/bin/x2gochangestatus create mode 100755 x2goserver/bin/x2gocmdexitmessage create mode 100755 x2goserver/bin/x2gocreatesession create mode 100755 x2goserver/bin/x2gogetagent create mode 100755 x2goserver/bin/x2gogetdisplays create mode 100755 x2goserver/bin/x2gogetports create mode 100755 x2goserver/bin/x2gogetservers create mode 100755 x2goserver/bin/x2goinsertport create mode 100755 x2goserver/bin/x2goinsertsession create mode 100755 x2goserver/bin/x2golistdesktops create mode 100755 x2goserver/bin/x2golistsessions create mode 100755 x2goserver/bin/x2golistsessions_root create mode 100755 x2goserver/bin/x2golistsessions_sql rename x2gomountdirs => x2goserver/bin/x2gomountdirs (86%) create mode 100755 x2goserver/bin/x2goprint create mode 100755 x2goserver/bin/x2goresume create mode 100755 x2goserver/bin/x2goresume-session rename x2goruncommand => x2goserver/bin/x2goruncommand (70%) create mode 100755 x2goserver/bin/x2gosessionlimit create mode 100755 x2goserver/bin/x2goshowblocks rename x2gosqlitewrapper => x2goserver/bin/x2gosqlitewrapper (90%) rename x2gostartagent => x2goserver/bin/x2gostartagent (87%) create mode 100755 x2goserver/bin/x2gosuspend-agent create mode 100755 x2goserver/bin/x2gosuspend-session create mode 100755 x2goserver/bin/x2goterminate create mode 100755 x2goserver/bin/x2goterminate-session create mode 100755 x2goserver/bin/x2goumount rename x2goumount_session => x2goserver/bin/x2goumount-session (68%) create mode 120000 x2goserver/bin/x2goumount_session rename x2goserver.conf => x2goserver/etc/x2goserver.conf (100%) rename sql => x2goserver/etc/x2gosql/sql (100%) create mode 100755 x2goserver/lib/a.out create mode 100644 x2goserver/lib/setuidwrapper.c create mode 100755 x2goserver/lib/test.py rename x2godbwrapper.pm => x2goserver/lib/x2godbwrapper.pm (94%) create mode 100644 x2goserver/man/man8/x2gocleansessions.8 create mode 100644 x2goserver/man/man8/x2golistsessions.8 create mode 100644 x2goserver/man/man8/x2gomountdirs.8 create mode 100644 x2goserver/man/man8/x2goprint.8 create mode 100644 x2goserver/man/man8/x2goresume-session.8 create mode 100644 x2goserver/man/man8/x2goruncommand.8 create mode 100644 x2goserver/man/man8/x2gostartagent.8 create mode 100644 x2goserver/man/man8/x2gosuspend-session.8 create mode 100644 x2goserver/man/man8/x2goterminate-session.8 create mode 100644 x2goserver/man/man8/x2goumount-session.8 create mode 100644 x2goserver/man/man8/x2goumount.8 rename x2gocleansessions => x2goserver/sbin/x2gocleansessions (65%) rename x2godbadmin => x2goserver/sbin/x2godbadmin (94%) create mode 120000 x2goserver/share/x2go/versions/VERSION.x2goserver delete mode 100755 x2gosessionlimit delete mode 100755 x2goshowblocks delete mode 100755 x2gosuspend-agent delete mode 100755 x2gosuspend-session delete mode 100755 x2goterminate delete mode 100755 x2goterminate-session delete mode 100755 x2goumount The diff of changes is: diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..a189806 --- /dev/null +++ b/INSTALL @@ -0,0 +1,53 @@ +TARBALL INSTALLATION OF x2goserver +================================== + +1.) INSTALL x2goserver FILES +----------------------------- +Extract tarball and run + + $ make install + +in base folder of the extracted tarball. + + +2.) USER + GROUP for X2go +------------------------- +Set up x2gouser account and its group if they do not exist +already: + + $ addgroup --system x2gousers + $ adduser --system --no-create-home \ + --disabled-password --disabled-login \ + --shell /bin/false --group --home /var/lib/x2go x2gouser + +3.) SUID USER +------------- +Configure ownership, permissions and setuid user bit of x2gosqlitewrapper: + + $ chown x2gouser:x2gousers /usr/bin/x2gosqlitewrapper + $ chmod 6755 /usr/bin/x2gosqlitewrapper + + +4.) INIT SCRIPT +--------------- +Create a simple init script that starts $PREFIX/sbin/x2gocleansessions on system start +(runlevel 2-3-4-5). + +Alternatively, you can add a single line to /etc/rc.local: + +/usr/local/sbin/x2gocleansessions & + + +5.) OPTIONAL: PostgreSQL setup +------------------------------ +This last step is optional and is only needed for a setup of x2goserver +with PostgreSQL as database backend... + +When using PostgreSQL the following steps are necessary: + + $ chmod 700 /etc/x2go/x2gosql/passwords + $ touch /etc/x2go/x2gosql/passwords/pgadmin + $ chmod 600 /etc/x2go/x2gosql/passwords/pgadmin + $ x2godbadmin --createdb + + diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..444112f --- /dev/null +++ b/Makefile @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +all: build + +build: build-indep + +clean: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + +build-indep: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + +install: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + +uninstall: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + + diff --git a/UNINSTALL b/UNINSTALL new file mode 100644 index 0000000..e75d6fc --- /dev/null +++ b/UNINSTALL @@ -0,0 +1,26 @@ +TARBALL UNINSTALL OF x2goserver +=============================== + +1.) Remove SQLite database +-------------------------- + $ rm -vf /var/lib/x2go/x2go_sessions + + +2.) Remove PostgreSQL passwords +------------------------------- + $ rm -vf /etc/x2go/x2gosql/passwords/pgadmin + + +3.) Remove x2gouser and groups from the system +---------------------------------------------- + + $ deluser x2gouser + $ delgroup x2gousers + + +4.) Run Makefile's uninstall +---------------------------- + + $ cd /path/to/extracted/x2goserver/tarball + $ make uninstall + diff --git a/debian/changelog b/debian/changelog index 40b449e..a01fa12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low + + [Mike Gabriel] + * Rename x2goumount_session calls to x2goumount-session calls in x2goserver + internal scripts. + * React to bug #627990, prefer man2html-base over man2html. + + [Martin Oehler] + * Removes old debug code fragment, fixes x2golistsessions parsing. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 05 Jun 2011 20:44:32 +0200 + +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. + + -- 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 + * fixes installation conflicts with x2goserver-one, x2goserver-home + and x2goprint + * change of version numbering scheme + * re-organization of folder structure + * adds several man pages + * adds x2goversion script + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 May 2011 10:42:02 +0200 + x2goserver (3.0.99-5) unstable; urgency=low * fixed db_getserver @@ -221,7 +255,7 @@ x2goserver (2.0.1-2) unstable; urgency=low x2goserver (2.0.1-1) unstable; urgency=low - * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + * Initial release -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 8 Feb 2007 15:21:30 +0100 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index a322e54..7a64da7 100644 --- a/debian/control +++ b/debian/control @@ -2,24 +2,84 @@ Source: x2goserver Section: x11 Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Uploaders: + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Build-Depends: + debhelper (>= 7.0.50~), + man2html-base | man2html +Standards-Version: 3.9.2 +Homepage: http://code.x2go.org/releases/source/x2goserver +Vcs-Git: git://code.x2go.org/x2goserver.git +Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver Architecture: all -Depends: x2goagent, perl-suid, lsof, openssh-client, openssh-server, libconfig-simple-perl, makepasswd, libdbd-pg-perl, libdbd-sqlite3-perl, adduser -Recommends: sshfs -Breaks: x2goserver-one -Description: x2goserver (daemon and tools) - x2go is a serverbased computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio/arts support - - authentication by smartcard and usb-stick - - KDE control-center modules for administration - - KDE based tools for just in time messaging and client surveillance +Depends: + ${misc:Depends}, + x2goagent, + perl-suid, + lsof, + openssh-client, + openssh-server, + libconfig-simple-perl, + makepasswd, + libdbd-pg-perl, + libdbd-sqlite3-perl, + adduser, + xauth +Recommends: + sshfs, + x11-apps, + x11-session-utils, + x11-utils, + x11-xfs-utils, + x11-xkb-utils, + x11-xserver-utils, + xinit, + x2goserver-extensions (= ${source:Version}) +Replaces: + x2goserver-one, + x2goserver-home, + x2goprint +Description: X2go server daemon scripts + X2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick . - x2goserver contains the main daemon and tools for - session administrations (scripts). + This package contains the main daemon and tools for + X2go server-side session administrations. + . + The x2goserver package provides full functionality + 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 + extensions package (x2goserver-extensions) installed. + +Package: x2goserver-extensions +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (= ${source:Version}), + x11-xkb-utils +Description: X2go server daemon scripts (extensions) + X2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - 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). + . + Make sure you have this package installed on your server + if you want non-legacy X2go clients to be able to + access your server without lack of features. diff --git a/debian/copyright b/debian/copyright index 487b08b..23cc85f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,35 +1,39 @@ -This package was debianized by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> on -Thu, 1 Feb 2007 14:11:03 +0100. - -It was downloaded from www.obviously-nice.de - -Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> - -Copyright (C) 2007-2011 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 -the Free Software Foundation; either version 2 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, write to the -Free Software Foundation, Inc., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +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 + +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 2 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, write to the +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 -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Copyright (C) 2007-2011 Heinz-Markus Graesing +heinz-m.graesing(a)obviously-nice.de +Upstream contributors to x2goserver-extensions: +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>: + * x2goversion + * x2gosetkeyboard + +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 is licensed under the GPL, see above. - diff --git a/debian/rules b/debian/rules index dc98d08..c34429d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,6 @@ #!/usr/bin/make -f -clean: - dh_testdir - dh_testroot - dh_clean +%: + dh $@ -build: - dh_prep - -# We have nothing to do by default. -binary-indep: build -binary-arch: build - dh_testdir - dh_testroot - dh_installdirs - dh_install - dh_installchangelogs - dh_installdocs - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch +override_dh_auto_install: diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-extensions.dirs new file mode 100644 index 0000000..45adc59 --- /dev/null +++ b/debian/x2goserver-extensions.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/x2go +usr/share/x2go/versions diff --git a/debian/x2goserver-extensions.docs b/debian/x2goserver-extensions.docs new file mode 100644 index 0000000..f000f68 --- /dev/null +++ b/debian/x2goserver-extensions.docs @@ -0,0 +1 @@ +x2goserver-extensions/.build_man2html/html diff --git a/debian/x2goserver-extensions.install b/debian/x2goserver-extensions.install new file mode 100644 index 0000000..8263b77 --- /dev/null +++ b/debian/x2goserver-extensions.install @@ -0,0 +1,2 @@ +x2goserver-extensions/bin/x2go* /usr/bin/ +x2goserver-extensions/VERSION.x2goserver-extensions /usr/share/x2go/versions/ \ No newline at end of file diff --git a/debian/x2goserver-extensions.manpages b/debian/x2goserver-extensions.manpages new file mode 100644 index 0000000..1dec58d --- /dev/null +++ b/debian/x2goserver-extensions.manpages @@ -0,0 +1 @@ +x2goserver-extensions/man/man8/* \ No newline at end of file diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs index 29d4959..8699a0c 100644 --- a/debian/x2goserver.dirs +++ b/debian/x2goserver.dirs @@ -1,5 +1,9 @@ etc/x2go etc/x2go/x2gosql etc/x2go/x2gosql/passwords -usr/lib/x2go/script +usr/bin +usr/sbin +usr/lib/x2go +usr/share/x2go +usr/share/x2go/versions var/lib/x2go diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs new file mode 100644 index 0000000..6c7d3af --- /dev/null +++ b/debian/x2goserver.docs @@ -0,0 +1 @@ +x2goserver/.build_man2html/html diff --git a/debian/x2goserver.init b/debian/x2goserver.init index e6285b6..14dbbe2 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 @@ -13,10 +13,17 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin case "$1" in start) echo "Cleaning up stale x2go sessions." - /usr/sbin/x2gocleansessions + /usr/sbin/x2gocleansessions ;; - stop|reload|force-reload|restart) - # nothing to do + stop) + # kill x2gocleansessions, ignore on failure + killall x2gocleansessions || true + ;; + reload|force-reload|restart) + # kill x2gocleansessions, ignore on failure + killall x2gocleansessions || true + echo "Cleaning up stale x2go sessions." + /usr/sbin/x2gocleansessions ;; *) N=/etc/init.d/x2goserver diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 4e20dd5..d33709c 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,33 +1,6 @@ -x2gochangestatus /usr/bin/ -x2gocmdexitmessage /usr/bin/ -x2gocreatesession /usr/bin/ -x2gogetagent /usr/bin/ -x2gogetdisplays /usr/bin/ -x2gogetports /usr/bin/ -x2gogetservers /usr/bin/ -x2goinsertport /usr/bin/ -x2goinsertsession /usr/bin/ -x2golistsessions /usr/bin/ -x2golistdesktops /usr/bin/ -x2golistsessions_root /usr/bin/ -x2golistsessions_sql /usr/bin/ -x2gomountdirs /usr/bin/ -x2goprint /usr/bin/ -x2goresume /usr/bin/ -x2goresume-session /usr/bin/ -x2goruncommand /usr/bin/ -x2goshowblocks /usr/bin/ -x2gosqlitewrapper /usr/bin/ -x2gostartagent /usr/bin/ -x2gosuspend-session /usr/bin/ -x2gosuspend-agent /usr/bin/ -x2goterminate /usr/bin/ -x2goterminate-session /usr/bin/ -x2goumount /usr/bin/ -x2goumount_session /usr/bin/ -x2gosessionlimit /usr/bin/ -sql /etc/x2go/x2gosql/ -x2goserver.conf /etc/x2go/ -x2godbwrapper.pm /usr/lib/x2go/ -x2gocleansessions /usr/sbin/ -x2godbadmin /usr/lib/x2go/script +x2goserver/bin/x2go* /usr/bin/ +x2goserver/sbin/x2go* /usr/sbin/ +x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ +x2goserver/etc/x2goserver.conf /etc/x2go/ +x2goserver/lib/x2godbwrapper.pm /usr/lib/x2go/ +x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ \ No newline at end of file diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages new file mode 100644 index 0000000..88720a8 --- /dev/null +++ b/debian/x2goserver.manpages @@ -0,0 +1 @@ +x2goserver/man/man8/* \ No newline at end of file diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index d81b6ce..4e75de8 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -41,7 +41,7 @@ case "$1" in fi if [ ! -f /var/lib/x2go/x2go_sessions ]; then - /usr/lib/x2go/script/x2godbadmin --createdb + x2godbadmin --createdb fi dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/bin/x2gosqlitewrapper || true diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm old mode 100644 new mode 100755 diff --git a/x2gochangestatus b/x2gochangestatus deleted file mode 100755 index f7ecfe9..0000000 --- a/x2gochangestatus +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $status=shift or die; -my $sid=shift or die; - -db_changestatus($status, $sid); diff --git a/x2gocmdexitmessage b/x2gocmdexitmessage deleted file mode 100755 index 29da10e..0000000 --- a/x2gocmdexitmessage +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - - -X2GO_ROOT=${HOME}/.x2go -MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput - -cat $MESSAGE_FILE \ No newline at end of file diff --git a/x2gocreatesession b/x2gocreatesession deleted file mode 100755 index 7776e6e..0000000 --- a/x2gocreatesession +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - - -my $cookie=shift or die; -my $pid=shift or die; -my $client=shift or die; -my $gr_port=shift or die; -my $snd_port=shift or die; -my $fs_port=shift or die; -my $sid=shift or die; - -db_createsession($cookie,$pid,$client,$gr_port, $snd_port, $fs_port, $sid); diff --git a/x2gogetagent b/x2gogetagent deleted file mode 100755 index cf0b265..0000000 --- a/x2gogetagent +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/perl -use strict; - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $sid=shift or die; -print db_getagent $sid; diff --git a/x2gogetdisplays b/x2gogetdisplays deleted file mode 100755 index 3e153e7..0000000 --- a/x2gogetdisplays +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $host=shift or die; -print join("\n", db_getdisplays($host)); diff --git a/x2gogetports b/x2gogetports deleted file mode 100755 index 0a1ec60..0000000 --- a/x2gogetports +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $host=shift or die; -print join("\n", db_getports($host)); diff --git a/x2gogetservers b/x2gogetservers deleted file mode 100755 index f81ed27..0000000 --- a/x2gogetservers +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -print join("\n", db_getservers); diff --git a/x2goinsertport b/x2goinsertport deleted file mode 100755 index 128ac5e..0000000 --- a/x2goinsertport +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $server=shift or die; -my $sid=shift or die; -my $port=shift or die; - -db_insertport($server,$sid,$port); -print "inserted"; - diff --git a/x2goinsertsession b/x2goinsertsession deleted file mode 100755 index fc616d5..0000000 --- a/x2goinsertsession +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $display=shift or die; -my $server=shift or die; -my $sid=shift or die; - -db_insertsession($display, $server, $sid); -print "inserted"; diff --git a/x2golistdesktops b/x2golistdesktops deleted file mode 100755 index 4e5d050..0000000 --- a/x2golistdesktops +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/perl -use strict; -use Sys::Hostname; - -my $serv=shift; -if( ! $serv) -{ - $serv=hostname; -} - -my $rsess=`x2golistsessions x2goserver |grep _stR`; -my @rsess=split("\n","$rsess"); -my @rdisplays; -for(my $i=0;$i<@rsess;$i++) -{ - my @sinfo=split("\\|",@rsess[$i]); - @rdisplays[$i]=@sinfo[2]; -} - -my $rdisp=join("I",@rdisplays); -$rdisp="I${rdisp}I"; - -my $uname=$ENV{'USER'}; -my $outp=`ls -1 /tmp/.X11-unix/`; -my @outp=split("\n","$outp"); -for(my $i=0;$i<@outp;$i++) -{ - my $display=@outp[$i]; - $display=~s/X/:/; - my $checkdisp=$display; - $checkdisp=~s/:/I/; - $checkdisp="${checkdisp}I"; - if (!( $rdisp =~ m/$checkdisp/ )) - { - my $inf=`xwininfo -root -display $display 2> /dev/null`; - if ( $inf=~ m/geometry/) - { - print "$uname\@$display\n"; - } - } -} - -$outp=`ls -1 /tmp/ | grep x2godesktopsharing_`; -@outp=split("\n","$outp"); - -for(my $i=0;$i<@outp;$i++) -{ - my @ln=split("\@",@outp[$i]); - if( @ln[1] ne $uname ) - { - print "@ln[1]\@@ln[2]\n"; - } -} diff --git a/x2golistsessions b/x2golistsessions deleted file mode 100755 index 88fc44e..0000000 --- a/x2golistsessions +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/perl -use Sys::Hostname; -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - - -sub check_stat -{ - my $sess=shift; - my $log="$ENV{'HOME'}/.x2go/C-$sess/session.log"; - my $text=`tail -1 $log`; - if($text =~ m/Session suspended/) - { - return 0; - } - return 1; -} - -my $serv=shift; -if( ! $serv) -{ - $serv=hostname; -} - -my @outp; -if($serv eq "--all-servers") -{ - @outp=db_listsessions_all(); -} -else -{ - @outp=db_listsessions($serv); -} - -for(my $i=0;$i<@outp;$i++) -{ - @outp[$i] =~ s/ //g; - @outp[$i] =~ s/\*/ /g; - my @sinfo=split('\\|',"@outp[$i]"); - if(@sinfo[4]eq 'F') - { - print "@outp[$i]\n"; - } - else - { - if(@sinfo[4]eq 'R') - { - if(!check_stat(@sinfo[1])) - { - db_changestatus( 'S', @sinfo[1] ); - @outp[$i] =~ s/\|R\|/\|S\|/; - system( "x2goumount_session @sinfo[1]"); - - } - } - print "@outp[$i]\n"; - } -} diff --git a/x2golistsessions_root b/x2golistsessions_root deleted file mode 100755 index c74cbfd..0000000 --- a/x2golistsessions_root +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/perl -use Sys::Hostname; -use strict; - - -sub check_stat -{ - my $sess=shift; - my $user=shift; - my $log="~$user/.x2go/C-$sess/session.log"; - my $text=`tail -1 $log`; - if($text =~ m/Session suspended/) - { - return 0; - } - return 1; -} - - -my $uname; - -my $serv=shift; -if( ! $serv) -{ - $serv=hostname; -} - -my $outp=`x2golistsessions_sql $serv 2>/dev/null`; - - -my @outp=split("\n","$outp"); - -for(my $i=0;$i<@outp;$i++) -{ - my @sinfo=split('\\|',"@outp[$i]"); - if(@sinfo[4]eq 'F') - { - print "@outp[$i]\n"; - } - else - { - if(@sinfo[4]eq 'R') - { - if(!check_stat(@sinfo[1],@sinfo[11])) - { - system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); - @outp[$i] =~ s/\|R\|/\|S\|/; - } - } - print "@outp[$i]\n"; - } -} diff --git a/x2golistsessions_sql b/x2golistsessions_sql deleted file mode 100755 index 071fac8..0000000 --- a/x2golistsessions_sql +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl -use strict; - - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - - - -my $serv=shift; -my @array; -if($serv eq "--all-servers") -{ - @array=dbsys_listsessionsroot_all(); -} -else -{ - @array=dbsys_listsessionsroot ($serv); -} -my $i; -for ( $i=0;$i<@array;$i++) -{ - my @ln=split('\|',@array[$i]); - if(@ln[4] eq "F") - { - dbsys_rmsessionsroot( @ln[1]); - } - print "@array[$i]\n"; -} diff --git a/x2goprint b/x2goprint deleted file mode 100755 index f314329..0000000 --- a/x2goprint +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl - -use File::Basename; -use File::Copy; -use File::Path; -use strict; - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -if (scalar(@ARGV) ==1) -{ - system ("su @ARGV[0] -c \"x2golistsessions --all-servers\" "); -} -elsif (scalar(@ARGV) != 4) -{ - print STDERR "ERROR: Usage:\nx2goprint user session file titleFile\nx2goprint user\n"; - exit 1; -} - -my ($user, $session, $file, $titleFile)=@ARGV; - -my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam("x2goprint"); -my $printdir=$homedir; - -my $title; -if( -e "$printdir/$titleFile") -{ - open (TITLE,"<$printdir/$titleFile"); - $title=<TITLE>; - close (TITLE); - unlink("$printdir/$titleFile"); -} - - -($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam($user); - -my $spoolbase="/tmp/spool_$user"; -my $spooldir="$spoolbase/$session"; -my $spooltmp="$spoolbase/tmp"; -mkpath($spooltmp); -chown $uid, $gid, "$spooltmp"; -chmod 0700, "$spooltmp"; - -my ($mounts)=db_getmounts($session); -if( $mounts=~m/$spooldir/) -{ - move("$printdir/$file", "$spooltmp") or die "$!: Can't move $file to $spooltmp/"; - chown $uid, $gid, "$spooltmp/$file"; - system("su $user -c \"mv $spooltmp/$file $spooldir\""); - - open (RFILE,">$spooltmp/$file.ready"); - print RFILE "$file\n$title"; - close (RFILE); - - chown $uid, $gid, "$spooltmp/$file.ready"; - system ("su $user -c \"mv $spooltmp/$file.ready $spooldir\""); -} -else -{ - unlink("$printdir/$file"); -} diff --git a/x2goresume b/x2goresume deleted file mode 100755 index 251fb5e..0000000 --- a/x2goresume +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $client=shift or die; -my $sid=shift or die; - -db_resume($client, $sid); diff --git a/x2goresume-session b/x2goresume-session deleted file mode 100755 index c9ca10a..0000000 --- a/x2goresume-session +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -SESSION_NAME=$1 -X2GO_GEOMETRY=$2 -X2GO_LINK=$3 -X2GO_PACK=$4 -X2GO_KBD_LAYOUT=$5 -X2GO_KBD_TYPE=$6 -X2GO_SET_KBD=$7 - - - -X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` - - -X2GO_ROOT=${HOME}/.x2go -X2GO_RESIZE=0 -X2GO_FULLSCREEN=0 - -if [ "$X2GO_GEOMETRY" == "" ] -then - X2GO_GEOMETRY=fullscreen -fi - -if [ "$X2GO_GEOMETRY" == "fullscreen" ] -then - X2GO_RESIZE=1 - X2GO_FULLSCREEN=1 -fi - -SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME} -OPTIONS=`cat ${SESSION_DIR}/options` - -GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` -RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}` -FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}` -LSTR=`echo "$OPTIONS" | awk -F, {'print $2'}` -PSTR=`echo "$OPTIONS" | awk -F, {'print $3'}` -KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}` - - -KTSTR=`echo $KTSTR | sed "s/\//\\\\\\\\\//"` -X2GO_KBD_TYPE=`echo $X2GO_KBD_TYPE | sed "s/\//\\\\\\\\\//"` - -if [ "$X2GO_SET_KBD" == "0" ] -then - X2GO_KBD_TYPE="null\/null" -fi - -NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ - -e "s/$PSTR/pack=$X2GO_PACK/"\ - -e "s/$KTSTR/kbtype=$X2GO_KBD_TYPE/"\ - -e "s/$GSTR/geometry=$X2GO_GEOMETRY/"\ - -e "s/$RSTR/resize=$X2GO_RESIZE/"\ - -e "s/$FSTR/fullscreen=$X2GO_FULLSCREEN/"` - - -#echo -e "old options:$OPTIONS\n\nnew options:$NEWOPTIONS" - - -X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` -if [ "$X2GO_CLIENT" == "" ] -then - X2GO_CLIENT=$HOSTNAME -fi - -echo "$NEWOPTIONS" >${SESSION_DIR}/options - -x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null - -kill -HUP $X2GO_AGENT_PID diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html new file mode 100644 index 0000000..cff91de --- /dev/null +++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -0,0 +1,61 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE> +</HEAD><BODY> +<H1>x2gosetkeyboard</H1> +Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2gosetkeyboard</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2gosetkeyboard</B> looks for a 'keyboard' file in the X2go session directory and introspects +the X2go session keyboard settings requested from the client side. +<P> + +If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error +will be raised). +<P> + +<A NAME="lbAE"> </A> +<H2>FILES</H2> + +${HOME}/.x2go/C-${X2GO_SESSION}/keyboard +<P> + +<A NAME="lbAF"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">FILES</A><DD> +<DT><A HREF="#lbAF">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html new file mode 100644 index 0000000..458ec41 --- /dev/null +++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html @@ -0,0 +1,69 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goversion</TITLE> +</HEAD><BODY> +<H1>x2goversion</H1> +Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goversion - Retrieve Code Versions of X2go Server Components +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goversion [<x2go-component>]</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goversion</B> allows to retrieve code versions of X2go server components. +<P> + +If the +<B>[<x2go-component>]</B> parameter is omitted then a list of all available X2go server +component names and versions is listed. +<P> + +If an X2go component is specified with the <B>[<x2go-component>]</B> parameter, then only the +component's version is printed to stdout. +<P> + +The <B>x2goversion</B> tool can be used by X2go client implementations to query server-side versions +of X2go components. +<P> + +<A NAME="lbAE"> </A> +<H2>FILES</H2> + +/usr/share/x2go/versions/VERSION.* +<P> + +<A NAME="lbAF"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">FILES</A><DD> +<DT><A HREF="#lbAF">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile new file mode 100755 index 0000000..c7ea989 --- /dev/null +++ b/x2goserver-extensions/Makefile @@ -0,0 +1,98 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR= +PREFIX=/usr/local +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +#SBINDIR=$(PREFIX)/sbin +#LIBDIR=$(PREFIX)/lib/x2go +MANDIR=$(PREFIX)/share/man +#SHAREDIR=$(PREFIX)/share/x2go + +BIN_SCRIPTS=$(shell cd bin && ls) +#SBIN_SCRIPTS=$(shell cd sbin && ls) +#LIB_FILES=$(shell cd lib && ls) + +man_pages = `cd man && find * -type f` + +MAN2HTML_BIN = man2html +MAN2HTML_SRC = man +MAN2HTML_DEST = .build_man2html/html + +all: clean build + +build: build-indep + +build-indep: build_man2html + +build_man2html: + mkdir -p $(MAN2HTML_DEST) + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + +install: install_scripts install_config install_man install_version + +install_scripts: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) +# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ +# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ +# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ + +install_config: +# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) +# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql +# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords +# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ +# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + +install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions + $(INSTALL_FILE) VERSION.x2goserver-extras $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras + +uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version + +uninstall_scripts: + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done +# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done +# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done +# $(RM_DIR) $(DESTDIR)$(LIBDIR) + +uninstall_config: +# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf +# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql +# $(RM_DIR) $(DESTDIR)$(ETCDIR) +# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords +# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql + +uninstall_man: + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + $(RM_DIR) $(DESTDIR)$(MANDIR) + +uninstall_version: + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions + $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions new file mode 100644 index 0000000..34936c7 --- /dev/null +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -0,0 +1 @@ +3.0.99.5 \ No newline at end of file diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard new file mode 100755 index 0000000..022f97d --- /dev/null +++ b/x2goserver-extensions/bin/x2gosetkeyboard @@ -0,0 +1,60 @@ +#!/bin/bash + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +set -e + +# set up paths +X2GO_SESSION_ROOT=${HOME}/.x2go +X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION} + +# client keyboard configuration +X2GO_CLIENT_KBD_FILE=${X2GO_SESSION_DIR}/keyboard + +test -f ${X2GO_CLIENT_KBD_FILE} || exit 0 + +read_keyboard_file() { + + # retrieve keyboard settings from keyboard file in X2go session dir + XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + +} + +update_keymap() { + + # prepare for setxkbmap call + [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES" + [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL" + [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT" + [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT" + [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS" + + # update keyboard map + setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS +} + +### main ### +read_keyboard_file +update_keymap diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver-extensions/bin/x2goversion new file mode 100755 index 0000000..64dd758 --- /dev/null +++ b/x2goserver-extensions/bin/x2goversion @@ -0,0 +1,47 @@ +#!/bin/bash + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions" + +get_version() { + cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1 +} + +if [ -n "$1" ]; then + X2GO_COMPONENT="$1" + X2GO_COMPONENT_VERFILE="${X2GO_VERSIONS_BASEPATH}/VERSION.${X2GO_COMPONENT}" + + 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 + fi +else + cd ${X2GO_VERSIONS_BASEPATH} + for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do + X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)" + X2GO_COMPONENT_VERSION="$(get_version $compfile)" + echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" + done + cd - >/dev/null +fi + diff --git a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 new file mode 100644 index 0000000..702155f --- /dev/null +++ b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 @@ -0,0 +1,29 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$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)" +.SH NAME +x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client +.SH SYNOPSIS +'nh +.fi +.ad l +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. +.PP +If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error +will be raised). +.PP +.SH FILES +${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 +(http://www.x2go.org). diff --git a/x2goserver-extensions/man/man8/x2goversion.8 b/x2goserver-extensions/man/man8/x2goversion.8 new file mode 100644 index 0000000..bb07d83 --- /dev/null +++ b/x2goserver-extensions/man/man8/x2goversion.8 @@ -0,0 +1,35 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$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)" +.SH NAME +x2goversion \- Retrieve Code Versions of X2go Server Components +.SH SYNOPSIS +'nh +.fi +.ad l +x2goversion [<x2go-component>] + +.SH DESCRIPTION +\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 +component names and versions is listed. +.PP +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. +.PP +.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 +(http://www.x2go.org). diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html new file mode 100644 index 0000000..5fa85bd --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2gocleansessions</TITLE> +</HEAD><BODY> +<H1>x2gocleansessions</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2gocleansessions - X2go Server Cleanup Daemon +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2gocleansessions</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2gocleansessions</B> is run as a service on X2go servers to handle the cleanup of stale sessions. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html new file mode 100644 index 0000000..b91d5b3 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2golistsessions</TITLE> +</HEAD><BODY> +<H1>x2golistsessions</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2golistsessions - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2golistsessions</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2golistsessions</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html new file mode 100644 index 0000000..81e8d63 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2gomountdirs</TITLE> +</HEAD><BODY> +<H1>x2gomountdirs</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2gomountdirs - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2gomountdirs</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2gomountdirs</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html new file mode 100644 index 0000000..d71bba5 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goprint</TITLE> +</HEAD><BODY> +<H1>x2goprint</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goprint - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goprint</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goprint</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html new file mode 100644 index 0000000..7ac8a17 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goresume-session</TITLE> +</HEAD><BODY> +<H1>x2goresume-session</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goresume-session - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goresume-session</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goresume-session</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html new file mode 100644 index 0000000..8a6506e --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goruncommand</TITLE> +</HEAD><BODY> +<H1>x2goruncommand</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goruncommand - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goruncommand</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goruncommand</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html new file mode 100644 index 0000000..38b5340 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2gostartagent</TITLE> +</HEAD><BODY> +<H1>x2gostartagent</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2gostartagent - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2gostartagent</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2gostartagent</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html new file mode 100644 index 0000000..9e1308e --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2gosuspend-session</TITLE> +</HEAD><BODY> +<H1>x2gosuspend-session</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2gosuspend-session - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2gosuspend-session</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2gosuspend-session</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html new file mode 100644 index 0000000..3f7bb19 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goterminate-session</TITLE> +</HEAD><BODY> +<H1>x2goterminate-session</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goterminate-session - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goterminate-session</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goterminate-session</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html new file mode 100644 index 0000000..1940b50 --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goumount_session</TITLE> +</HEAD><BODY> +<H1>x2goumount_session</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goumount_session - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goumount_session</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goumount_session</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount.8.html b/x2goserver/.build_man2html/html/man8/x2goumount.8.html new file mode 100644 index 0000000..7c6b79d --- /dev/null +++ b/x2goserver/.build_man2html/html/man8/x2goumount.8.html @@ -0,0 +1,49 @@ +Content-type: text/html + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML><HEAD><TITLE>Man page of x2goumount</TITLE> +</HEAD><BODY> +<H1>x2goumount</H1> +Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<A HREF="../index.html">Return to Main Contents</A><HR> + +<A NAME="lbAB"> </A> +<H2>NAME</H2> + +x2goumount - X2go Server Script +<A NAME="lbAC"> </A> +<H2>SYNOPSIS</H2> + + + + +<B>x2goumount</B> +<P> +<A NAME="lbAD"> </A> +<H2>DESCRIPTION</H2> + +<B>x2goumount</B> is one of many scripts belonging to X2go Server. +<P> + +<A NAME="lbAE"> </A> +<H2>AUTHOR</H2> + +This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project +(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> +<P> + +<HR> +<A NAME="index"> </A><H2>Index</H2> +<DL> +<DT><A HREF="#lbAB">NAME</A><DD> +<DT><A HREF="#lbAC">SYNOPSIS</A><DD> +<DT><A HREF="#lbAD">DESCRIPTION</A><DD> +<DT><A HREF="#lbAE">AUTHOR</A><DD> +</DL> +<HR> +This document was created by +<A HREF="/cgi-bin/man/man2html">man2html</A>, +using the manual pages.<BR> +Time: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/Makefile b/x2goserver/Makefile new file mode 100755 index 0000000..765f17f --- /dev/null +++ b/x2goserver/Makefile @@ -0,0 +1,98 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR= +PREFIX=/usr/local +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +SBINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/lib/x2go +MANDIR=$(PREFIX)/share/man +SHAREDIR=$(PREFIX)/share/x2go + +BIN_SCRIPTS=$(shell cd bin && ls) +SBIN_SCRIPTS=$(shell cd sbin && ls) +LIB_FILES=$(shell cd lib && ls) + +man_pages = `cd man && find * -type f` + +MAN2HTML_BIN = man2html +MAN2HTML_SRC = man +MAN2HTML_DEST = .build_man2html/html + +all: clean build + +build: build-indep + +build-indep: build_man2html + +build_man2html: + mkdir -p $(MAN2HTML_DEST) + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + +install: install_scripts install_config install_man install_version + +install_scripts: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ + $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ + +install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords + $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + +install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions + $(INSTALL_FILE) VERSION.x2goserver $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver + +uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version + +uninstall_scripts: + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done + for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done + for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done + $(RM_DIR) $(DESTDIR)$(LIBDIR) + +uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql + $(RM_DIR) $(DESTDIR)$(ETCDIR) + $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords + $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql + +uninstall_man: + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + $(RM_DIR) $(DESTDIR)$(MANDIR) + +uninstall_version: + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver + $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver new file mode 100644 index 0000000..34936c7 --- /dev/null +++ b/x2goserver/VERSION.x2goserver @@ -0,0 +1 @@ +3.0.99.5 \ No newline at end of file diff --git a/x2goserver/bin/x2gochangestatus b/x2goserver/bin/x2gochangestatus new file mode 100755 index 0000000..542cab4 --- /dev/null +++ b/x2goserver/bin/x2gochangestatus @@ -0,0 +1,32 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $status=shift or die; +my $sid=shift or die; + +db_changestatus($status, $sid); diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage new file mode 100755 index 0000000..9c5e7bd --- /dev/null +++ b/x2goserver/bin/x2gocmdexitmessage @@ -0,0 +1,26 @@ +#!/bin/bash + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +X2GO_ROOT=${HOME}/.x2go +MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput + +cat $MESSAGE_FILE \ No newline at end of file diff --git a/x2goserver/bin/x2gocreatesession b/x2goserver/bin/x2gocreatesession new file mode 100755 index 0000000..3609a34 --- /dev/null +++ b/x2goserver/bin/x2gocreatesession @@ -0,0 +1,37 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + +my $cookie=shift or die; +my $pid=shift or die; +my $client=shift or die; +my $gr_port=shift or die; +my $snd_port=shift or die; +my $fs_port=shift or die; +my $sid=shift or die; + +db_createsession($cookie,$pid,$client,$gr_port, $snd_port, $fs_port, $sid); diff --git a/x2goserver/bin/x2gogetagent b/x2goserver/bin/x2gogetagent new file mode 100755 index 0000000..9a66104 --- /dev/null +++ b/x2goserver/bin/x2gogetagent @@ -0,0 +1,29 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $sid=shift or die; +print db_getagent $sid; diff --git a/x2goserver/bin/x2gogetdisplays b/x2goserver/bin/x2gogetdisplays new file mode 100755 index 0000000..75b9f18 --- /dev/null +++ b/x2goserver/bin/x2gogetdisplays @@ -0,0 +1,29 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $host=shift or die; +print join("\n", db_getdisplays($host)); diff --git a/x2goserver/bin/x2gogetports b/x2goserver/bin/x2gogetports new file mode 100755 index 0000000..bf0d345 --- /dev/null +++ b/x2goserver/bin/x2gogetports @@ -0,0 +1,29 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $host=shift or die; +print join("\n", db_getports($host)); diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers new file mode 100755 index 0000000..38aa496 --- /dev/null +++ b/x2goserver/bin/x2gogetservers @@ -0,0 +1,28 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +print join("\n", db_getservers); diff --git a/x2goserver/bin/x2goinsertport b/x2goserver/bin/x2goinsertport new file mode 100755 index 0000000..75ec3c5 --- /dev/null +++ b/x2goserver/bin/x2goinsertport @@ -0,0 +1,34 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $server=shift or die; +my $sid=shift or die; +my $port=shift or die; + +db_insertport($server,$sid,$port); +print "inserted"; + diff --git a/x2goserver/bin/x2goinsertsession b/x2goserver/bin/x2goinsertsession new file mode 100755 index 0000000..300c71f --- /dev/null +++ b/x2goserver/bin/x2goinsertsession @@ -0,0 +1,33 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $display=shift or die; +my $server=shift or die; +my $sid=shift or die; + +db_insertsession($display, $server, $sid); +print "inserted"; diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops new file mode 100755 index 0000000..8ba46ae --- /dev/null +++ b/x2goserver/bin/x2golistdesktops @@ -0,0 +1,74 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; +use Sys::Hostname; + +my $serv=shift; +if( ! $serv) +{ + $serv=hostname; +} + +my $rsess=`x2golistsessions x2goserver |grep _stR`; +my @rsess=split("\n","$rsess"); +my @rdisplays; +for(my $i=0;$i<@rsess;$i++) +{ + my @sinfo=split("\\|",@rsess[$i]); + @rdisplays[$i]=@sinfo[2]; +} + +my $rdisp=join("I",@rdisplays); +$rdisp="I${rdisp}I"; + +my $uname=$ENV{'USER'}; +my $outp=`ls -1 /tmp/.X11-unix/`; +my @outp=split("\n","$outp"); +for(my $i=0;$i<@outp;$i++) +{ + my $display=@outp[$i]; + $display=~s/X/:/; + my $checkdisp=$display; + $checkdisp=~s/:/I/; + $checkdisp="${checkdisp}I"; + if (!( $rdisp =~ m/$checkdisp/ )) + { + my $inf=`xwininfo -root -display $display 2> /dev/null`; + if ( $inf=~ m/geometry/) + { + print "$uname\@$display\n"; + } + } +} + +$outp=`ls -1 /tmp/ | grep x2godesktopsharing_`; +@outp=split("\n","$outp"); + +for(my $i=0;$i<@outp;$i++) +{ + my @ln=split("\@",@outp[$i]); + if( @ln[1] ne $uname ) + { + print "@ln[1]\@@ln[2]\n"; + } +} diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions new file mode 100755 index 0000000..0119f3b --- /dev/null +++ b/x2goserver/bin/x2golistsessions @@ -0,0 +1,81 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use Sys::Hostname; +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + +sub check_stat +{ + my $sess=shift; + my $log="$ENV{'HOME'}/.x2go/C-$sess/session.log"; + my $text=`tail -1 $log`; + if($text =~ m/Session suspended/) + { + return 0; + } + return 1; +} + +my $serv=shift; +if( ! $serv) +{ + $serv=hostname; +} + +my @outp; +if($serv eq "--all-servers") +{ + @outp=db_listsessions_all(); +} +else +{ + @outp=db_listsessions($serv); +} + +for(my $i=0;$i<@outp;$i++) +{ + @outp[$i] =~ s/ //g; + @outp[$i] =~ s/\*/ /g; + my @sinfo=split('\\|',"@outp[$i]"); + if(@sinfo[4]eq 'F') + { + print "@outp[$i]\n"; + } + else + { + if(@sinfo[4]eq 'R') + { + if(!check_stat(@sinfo[1])) + { + db_changestatus( 'S', @sinfo[1] ); + @outp[$i] =~ s/\|R\|/\|S\|/; + system( "x2goumount-session @sinfo[1]"); + + } + } + print "@outp[$i]\n"; + } +} diff --git a/x2goserver/bin/x2golistsessions_root b/x2goserver/bin/x2golistsessions_root new file mode 100755 index 0000000..0df7249 --- /dev/null +++ b/x2goserver/bin/x2golistsessions_root @@ -0,0 +1,73 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use Sys::Hostname; +use strict; + + +sub check_stat +{ + my $sess=shift; + my $user=shift; + my $log="~$user/.x2go/C-$sess/session.log"; + my $text=`tail -1 $log`; + if($text =~ m/Session suspended/) + { + return 0; + } + return 1; +} + + +my $uname; + +my $serv=shift; +if( ! $serv) +{ + $serv=hostname; +} + +my $outp=`x2golistsessions_sql $serv 2>/dev/null`; + + +my @outp=split("\n","$outp"); + +for(my $i=0;$i<@outp;$i++) +{ + my @sinfo=split('\\|',"@outp[$i]"); + if(@sinfo[4]eq 'F') + { + print "@outp[$i]\n"; + } + else + { + if(@sinfo[4]eq 'R') + { + if(!check_stat(@sinfo[1],@sinfo[11])) + { + system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); + @outp[$i] =~ s/\|R\|/\|S\|/; + } + } + print "@outp[$i]\n"; + } +} diff --git a/x2goserver/bin/x2golistsessions_sql b/x2goserver/bin/x2golistsessions_sql new file mode 100755 index 0000000..4f1abdc --- /dev/null +++ b/x2goserver/bin/x2golistsessions_sql @@ -0,0 +1,49 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + + +my $serv=shift; +my @array; +if($serv eq "--all-servers") +{ + @array=dbsys_listsessionsroot_all(); +} +else +{ + @array=dbsys_listsessionsroot ($serv); +} +my $i; +for ( $i=0;$i<@array;$i++) +{ + my @ln=split('\|',@array[$i]); + if(@ln[4] eq "F") + { + dbsys_rmsessionsroot( @ln[1]); + } + print "@array[$i]\n"; +} diff --git a/x2gomountdirs b/x2goserver/bin/x2gomountdirs similarity index 86% rename from x2gomountdirs rename to x2goserver/bin/x2gomountdirs index d436066..e84149d 100755 --- a/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -1,4 +1,25 @@ #!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + use strict; use lib "/usr/lib/x2go"; diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint new file mode 100755 index 0000000..1a4ebaf --- /dev/null +++ b/x2goserver/bin/x2goprint @@ -0,0 +1,82 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use File::Basename; +use File::Copy; +use File::Path; +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +if (scalar(@ARGV) ==1) +{ + system ("su @ARGV[0] -c \"x2golistsessions --all-servers\" "); +} +elsif (scalar(@ARGV) != 4) +{ + print STDERR "ERROR: Usage:\nx2goprint user session file titleFile\nx2goprint user\n"; + exit 1; +} + +my ($user, $session, $file, $titleFile)=@ARGV; + +my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam("x2goprint"); +my $printdir=$homedir; + +my $title; +if( -e "$printdir/$titleFile") +{ + open (TITLE,"<$printdir/$titleFile"); + $title=<TITLE>; + close (TITLE); + unlink("$printdir/$titleFile"); +} + + +($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam($user); + +my $spoolbase="/tmp/spool_$user"; +my $spooldir="$spoolbase/$session"; +my $spooltmp="$spoolbase/tmp"; +mkpath($spooltmp); +chown $uid, $gid, "$spooltmp"; +chmod 0700, "$spooltmp"; + +my ($mounts)=db_getmounts($session); +if( $mounts=~m/$spooldir/) +{ + move("$printdir/$file", "$spooltmp") or die "$!: Can't move $file to $spooltmp/"; + chown $uid, $gid, "$spooltmp/$file"; + system("su $user -c \"mv $spooltmp/$file $spooldir\""); + + open (RFILE,">$spooltmp/$file.ready"); + print RFILE "$file\n$title"; + close (RFILE); + + chown $uid, $gid, "$spooltmp/$file.ready"; + system ("su $user -c \"mv $spooltmp/$file.ready $spooldir\""); +} +else +{ + unlink("$printdir/$file"); +} diff --git a/x2goserver/bin/x2goresume b/x2goserver/bin/x2goresume new file mode 100755 index 0000000..eb65a5d --- /dev/null +++ b/x2goserver/bin/x2goresume @@ -0,0 +1,31 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $client=shift or die; +my $sid=shift or die; + +db_resume($client, $sid); diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session new file mode 100755 index 0000000..25e7832 --- /dev/null +++ b/x2goserver/bin/x2goresume-session @@ -0,0 +1,91 @@ +#!/bin/bash + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +SESSION_NAME=$1 +X2GO_GEOMETRY=$2 +X2GO_LINK=$3 +X2GO_PACK=$4 +X2GO_KBD_LAYOUT=$5 +X2GO_KBD_TYPE=$6 +X2GO_SET_KBD=$7 + + + +X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` + + +X2GO_ROOT=${HOME}/.x2go +X2GO_RESIZE=0 +X2GO_FULLSCREEN=0 + +if [ "$X2GO_GEOMETRY" == "" ] +then + X2GO_GEOMETRY=fullscreen +fi + +if [ "$X2GO_GEOMETRY" == "fullscreen" ] +then + X2GO_RESIZE=1 + X2GO_FULLSCREEN=1 +fi + +SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME} +OPTIONS=`cat ${SESSION_DIR}/options` + +GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` +RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}` +FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}` +LSTR=`echo "$OPTIONS" | awk -F, {'print $2'}` +PSTR=`echo "$OPTIONS" | awk -F, {'print $3'}` +KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}` + + +KTSTR=`echo $KTSTR | sed "s/\//\\\\\\\\\//"` +X2GO_KBD_TYPE=`echo $X2GO_KBD_TYPE | sed "s/\//\\\\\\\\\//"` + +if [ "$X2GO_SET_KBD" == "0" ] +then + X2GO_KBD_TYPE="null\/null" +fi + +NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ + -e "s/$PSTR/pack=$X2GO_PACK/"\ + -e "s/$KTSTR/kbtype=$X2GO_KBD_TYPE/"\ + -e "s/$GSTR/geometry=$X2GO_GEOMETRY/"\ + -e "s/$RSTR/resize=$X2GO_RESIZE/"\ + -e "s/$FSTR/fullscreen=$X2GO_FULLSCREEN/"` + + +#echo -e "old options:$OPTIONS\n\nnew options:$NEWOPTIONS" + + +X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` +if [ "$X2GO_CLIENT" == "" ] +then + X2GO_CLIENT=$HOSTNAME +fi + +echo "$NEWOPTIONS" >${SESSION_DIR}/options + +x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null + +kill -HUP $X2GO_AGENT_PID diff --git a/x2goruncommand b/x2goserver/bin/x2goruncommand similarity index 70% rename from x2goruncommand rename to x2goserver/bin/x2goruncommand index 4c44833..b639774 100755 --- a/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -1,5 +1,25 @@ #!/bin/bash +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + DISPLAY=":$1" X2GO_AGENT_PID=$2 X2GO_SESSION=$3 @@ -114,4 +134,4 @@ fi kill -TERM $X2GO_AGENT_PID x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME -x2goumount_session $X2GO_SESSION +x2goumount-session $X2GO_SESSION diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit new file mode 100755 index 0000000..36b275c --- /dev/null +++ b/x2goserver/bin/x2gosessionlimit @@ -0,0 +1,97 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; +use Config::Simple; + +my $maxlimit=0; +my $Config = new Config::Simple(syntax=>'ini'); +$Config->read('/etc/x2go/x2goserver.conf' ); + +sub getGroupLimit +{ + my $group=shift; + my $strlimit=$Config->param("limit groups.$group"); + if($strlimit ne "") + { + if($strlimit == 0) + { + print "0\n"; + exit 0; + } + if($strlimit > $maxlimit) + { + $maxlimit=$strlimit; + } + } +} + +my $uname; +$uname=getpwuid($<); + +my $runningsessions=`x2golistsessions --all-servers`; +my @sessions=split("\n",$runningsessions); +my $scount=@sessions; + +my $strlimit=$Config->param("limit users.$uname"); + +if($strlimit ne "") +{ + if($strlimit == 0) + { + print "0\n"; + exit 0; + } + if($strlimit <= $scount) + { + print "$strlimit\n"; + exit 0; + } + print "$strlimit\n"; + exit 0; +} + + +my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($uname); + +while (my ($name, $passwd, $gid, $members) = getgrent()) +{ + if( $pgid eq $gid) + { + getGroupLimit $name; + } + my @memebers=split(" ",$members); + foreach my $member (@memebers) + { + if($uname eq $member ) + { + getGroupLimit $name; + } + } +} + +if($maxlimit <= $scount) +{ + print "$maxlimit\n"; + exit 0; +} +print "$maxlimit\n"; diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks new file mode 100755 index 0000000..ad64f65 --- /dev/null +++ b/x2goserver/bin/x2goshowblocks @@ -0,0 +1,37 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + +my $uname=shift; +my $id=shift; +my $tbl="mounts"; +my @outp=dbsys_getmounts( $id); +for(my $i=0;$i<@outp;$i++) +{ + my $path=(split("\\|",@outp[$i]))[1]; + print `su $uname -c "lsof 2>/dev/null | grep $path"`; +} diff --git a/x2gosqlitewrapper b/x2goserver/bin/x2gosqlitewrapper similarity index 90% rename from x2gosqlitewrapper rename to x2goserver/bin/x2gosqlitewrapper index 6747caa..9cbf663 100755 --- a/x2gosqlitewrapper +++ b/x2goserver/bin/x2gosqlitewrapper @@ -1,5 +1,25 @@ #!/usr/bin/perl +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + use strict; use DBI; diff --git a/x2gostartagent b/x2goserver/bin/x2gostartagent similarity index 87% rename from x2gostartagent rename to x2goserver/bin/x2gostartagent index 2883fe7..ff19983 100755 --- a/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -1,5 +1,25 @@ #!/bin/bash +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 diff --git a/x2goserver/bin/x2gosuspend-agent b/x2goserver/bin/x2gosuspend-agent new file mode 100755 index 0000000..9ca6d4f --- /dev/null +++ b/x2goserver/bin/x2gosuspend-agent @@ -0,0 +1,30 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +shift; +shift; +shift; + +my $capt=shift; +my @words=split(" ",$capt); + +system("/usr/bin/x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session new file mode 100755 index 0000000..1f4084c --- /dev/null +++ b/x2goserver/bin/x2gosuspend-session @@ -0,0 +1,43 @@ +#!/bin/bash + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + + +X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` +X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` + + +#workaround for knotify +killall -HUP knotify + +x2gochangestatus 'S' $SESSION_NAME > /dev/null + + +kill -HUP $X2GO_AGENT_PID + +export HOSTNAME +x2goumount-session $SESSION_NAME diff --git a/x2goserver/bin/x2goterminate b/x2goserver/bin/x2goterminate new file mode 100755 index 0000000..125d228 --- /dev/null +++ b/x2goserver/bin/x2goterminate @@ -0,0 +1,30 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; +my $proc=shift; + +my @outp=split(",","$proc"); +for(my $i=0;$i<@outp;$i++) +{ + system("kill @outp[$i]"); +} diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session new file mode 100755 index 0000000..989e272 --- /dev/null +++ b/x2goserver/bin/x2goterminate-session @@ -0,0 +1,36 @@ +#!/bin/bash + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` +X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` + +x2gochangestatus 'F' $SESSION_NAME > /dev/null + +kill -TERM $X2GO_AGENT_PID +export HOSTNAME +x2goumount-session $SESSION_NAME diff --git a/x2goserver/bin/x2goumount b/x2goserver/bin/x2goumount new file mode 100755 index 0000000..7d160f2 --- /dev/null +++ b/x2goserver/bin/x2goumount @@ -0,0 +1,62 @@ +#!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $fname=shift; +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +my $session=<F>; +close(F); + +$session=~s/\n//; + +chomp($dir); +my $uname=$ENV{'USER'}; + +my $use_zenity=0; + +if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +{ + $use_zenity=1; +} + +if(system( "fusermount -u $dir" ) == 0) +{ + unlink($fname); + db_deletemount( $session, $dir); + rmdir ($dir); +} +else +{ + if($use_zenity == 0) + { + system("kdialog --error \"Can't umount:\n $dir\"&"); + } + else + { + system("zenity --error --text \"Can't umount:\n $dir\"&"); + } +} diff --git a/x2goumount_session b/x2goserver/bin/x2goumount-session similarity index 68% rename from x2goumount_session rename to x2goserver/bin/x2goumount-session index 3b73702..92228a6 100755 --- a/x2goumount_session +++ b/x2goserver/bin/x2goumount-session @@ -1,4 +1,25 @@ #!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + use Sys::Hostname; use strict; @@ -24,9 +45,6 @@ if($only_path) my $display=db_getdisplay($session); - -print "DISPLAY=$display\n"; - my @outp=db_getmounts($session); my $i; diff --git a/x2goserver/bin/x2goumount_session b/x2goserver/bin/x2goumount_session new file mode 120000 index 0000000..b33a4dc --- /dev/null +++ b/x2goserver/bin/x2goumount_session @@ -0,0 +1 @@ +x2goumount-session \ No newline at end of file diff --git a/x2goserver.conf b/x2goserver/etc/x2goserver.conf similarity index 100% rename from x2goserver.conf rename to x2goserver/etc/x2goserver.conf diff --git a/sql b/x2goserver/etc/x2gosql/sql similarity index 100% rename from sql rename to x2goserver/etc/x2gosql/sql diff --git a/x2goserver/lib/a.out b/x2goserver/lib/a.out new file mode 100755 index 0000000..af8f40e Binary files /dev/null and b/x2goserver/lib/a.out differ diff --git a/x2goserver/lib/setuidwrapper.c b/x2goserver/lib/setuidwrapper.c new file mode 100644 index 0000000..9280cdc --- /dev/null +++ b/x2goserver/lib/setuidwrapper.c @@ -0,0 +1,12 @@ +#include <unistd.h> +#include <stdio.h> + +#define myfile "test.py" + +main(argc, argv) +char **argv; +{ + setuid(0); + seteuid(0); + execv(myfile, argv); +} diff --git a/x2goserver/lib/test.py b/x2goserver/lib/test.py new file mode 100755 index 0000000..7eea6e3 --- /dev/null +++ b/x2goserver/lib/test.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python + +import os +import time + +print os.geteuid() +print os.getegid() + +time.sleep(1000) diff --git a/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm similarity index 94% rename from x2godbwrapper.pm rename to x2goserver/lib/x2godbwrapper.pm index 4312cf0..be84bc8 100644 --- a/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -1,3 +1,23 @@ +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + package x2godbwrapper; use strict; diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 new file mode 100644 index 0000000..93e9b0d --- /dev/null +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gocleansessions 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2gocleansessions \- X2go Server Cleanup Daemon +.SH SYNOPSIS +'nh +.fi +.ad l +x2gocleansessions + +.SH DESCRIPTION +\fBx2gocleansessions\fR is run as a service on X2go servers to handle the cleanup of stale sessions. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 new file mode 100644 index 0000000..54f85b3 --- /dev/null +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2golistsessions 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2golistsessions \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2golistsessions + +.SH DESCRIPTION +\fBx2golistsessions\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 new file mode 100644 index 0000000..fec5c97 --- /dev/null +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gomountdirs 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2gomountdirs \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2gomountdirs + +.SH DESCRIPTION +\fBx2gomountdirs\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2goprint.8 b/x2goserver/man/man8/x2goprint.8 new file mode 100644 index 0000000..542aa2c --- /dev/null +++ b/x2goserver/man/man8/x2goprint.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goprint 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goprint \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2goprint + +.SH DESCRIPTION +\fBx2goprint\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 new file mode 100644 index 0000000..f18f421 --- /dev/null +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goresume-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goresume-session \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2goresume-session + +.SH DESCRIPTION +\fBx2goresume-session\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 new file mode 100644 index 0000000..370d907 --- /dev/null +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goruncommand 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goruncommand \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2goruncommand + +.SH DESCRIPTION +\fBx2goruncommand\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 new file mode 100644 index 0000000..6a84a72 --- /dev/null +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -0,0 +1,35 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$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" +.SH NAME +x2gostartagent \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2gostartagent <geometry> <link-quality> <nx-pack-meth> <cache-type+dpi> <kblayout> <kbtype> <setkbd> <session-type> <command> + +.SH DESCRIPTION +\fBx2gostartagent\fR is a script that coordinates the startup process of new X2go sessions. +It expects quite a list of parameters, all of which are obligatory. +.SH RETURN VALUES +A list of parameters will be returned after a successful session startup. Each value will be presented on +a new line: + + \fB<X-display-number>\fR + \fB<session-cookie-hash>\fR + \fB<x2goagent-pid>\fR + \fB<session-name>\fR + \fB<graphics-port>\fR + \fB<sound-port>\fR + \fB<sshfs-port>\fR + +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 new file mode 100644 index 0000000..ec4aa2c --- /dev/null +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosuspend-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2gosuspend-session \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-session + +.SH DESCRIPTION +\fBx2gosuspend-session\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 new file mode 100644 index 0000000..2bfcce8 --- /dev/null +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goterminate-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goterminate-session \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2goterminate-session + +.SH DESCRIPTION +\fBx2goterminate-session\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 new file mode 100644 index 0000000..bdf226c --- /dev/null +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goumount-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goumount-session \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2goumount-session\fR + +.SH DESCRIPTION +\fBx2goumount-session\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2goumount.8 b/x2goserver/man/man8/x2goumount.8 new file mode 100644 index 0000000..99bd655 --- /dev/null +++ b/x2goserver/man/man8/x2goumount.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goumount 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goumount \- X2go Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +x2goumount + +.SH DESCRIPTION +\fBx2goumount\fR is one of many scripts belonging to X2go Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2gocleansessions b/x2goserver/sbin/x2gocleansessions similarity index 65% rename from x2gocleansessions rename to x2goserver/sbin/x2gocleansessions index 373326d..14c38ac 100755 --- a/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -1,4 +1,25 @@ #!/usr/bin/perl + +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + use Sys::Hostname; use strict; @@ -78,14 +99,14 @@ elsif ($pid == 0 ) { #print "@sinfo[1], is blocked\n"; #print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } elsif(! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { system("su @sinfo[11] -c \"x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); #print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n"; #print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } else { @@ -96,7 +117,7 @@ elsif ($pid == 0 ) system("su @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); #print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n"; #print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } } diff --git a/x2godbadmin b/x2goserver/sbin/x2godbadmin similarity index 94% rename from x2godbadmin rename to x2goserver/sbin/x2godbadmin index ccb1bdf..7dc98b6 100755 --- a/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -1,5 +1,25 @@ #!/usr/bin/perl +# 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 +# the Free Software Foundation; either version 2 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, write to the +# 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> + use strict; use Getopt::Long; diff --git a/x2goserver/share/x2go/versions/VERSION.x2goserver b/x2goserver/share/x2go/versions/VERSION.x2goserver new file mode 120000 index 0000000..fc1b443 --- /dev/null +++ b/x2goserver/share/x2go/versions/VERSION.x2goserver @@ -0,0 +1 @@ +../../../VERSION.x2goserver \ No newline at end of file diff --git a/x2gosessionlimit b/x2gosessionlimit deleted file mode 100755 index 8182e2d..0000000 --- a/x2gosessionlimit +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/perl - -use strict; -use Config::Simple; - -my $maxlimit=0; -my $Config = new Config::Simple(syntax=>'ini'); -$Config->read('/etc/x2go/x2goserver.conf' ); - -sub getGroupLimit -{ - my $group=shift; - my $strlimit=$Config->param("limit groups.$group"); - if($strlimit ne "") - { - if($strlimit == 0) - { - print "0\n"; - exit 0; - } - if($strlimit > $maxlimit) - { - $maxlimit=$strlimit; - } - } -} - -my $uname; -$uname=getpwuid($<); - -my $runningsessions=`x2golistsessions --all-servers`; -my @sessions=split("\n",$runningsessions); -my $scount=@sessions; - -my $strlimit=$Config->param("limit users.$uname"); - -if($strlimit ne "") -{ - if($strlimit == 0) - { - print "0\n"; - exit 0; - } - if($strlimit <= $scount) - { - print "$strlimit\n"; - exit 0; - } - print "$strlimit\n"; - exit 0; -} - - -my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($uname); - -while (my ($name, $passwd, $gid, $members) = getgrent()) -{ - if( $pgid eq $gid) - { - getGroupLimit $name; - } - my @memebers=split(" ",$members); - foreach my $member (@memebers) - { - if($uname eq $member ) - { - getGroupLimit $name; - } - } -} - -if($maxlimit <= $scount) -{ - print "$maxlimit\n"; - exit 0; -} -print "$maxlimit\n"; diff --git a/x2goshowblocks b/x2goshowblocks deleted file mode 100755 index 911ef48..0000000 --- a/x2goshowblocks +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/perl -use strict; - - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - - -my $uname=shift; -my $id=shift; -my $tbl="mounts"; -my @outp=dbsys_getmounts( $id); -for(my $i=0;$i<@outp;$i++) -{ - my $path=(split("\\|",@outp[$i]))[1]; - print `su $uname -c "lsof 2>/dev/null | grep $path"`; -} diff --git a/x2gosuspend-agent b/x2gosuspend-agent deleted file mode 100755 index 95219b7..0000000 --- a/x2gosuspend-agent +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/perl - -shift; -shift; -shift; - -my $capt=shift; -my @words=split(" ",$capt); - -system("/usr/bin/x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file diff --git a/x2gosuspend-session b/x2gosuspend-session deleted file mode 100755 index 4e29188..0000000 --- a/x2gosuspend-session +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -if [ $# -eq 1 ]; then - SESSION_NAME=$1 -else - SESSION_NAME=$X2GO_SESSION -fi - - -X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` -X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` - - -#workaround for knotify -killall -HUP knotify - -x2gochangestatus 'S' $SESSION_NAME > /dev/null - - -kill -HUP $X2GO_AGENT_PID - -export HOSTNAME -x2goumount_session $SESSION_NAME diff --git a/x2goterminate b/x2goterminate deleted file mode 100755 index 1b10033..0000000 --- a/x2goterminate +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/perl -use strict; -my $proc=shift; - -my @outp=split(",","$proc"); -for(my $i=0;$i<@outp;$i++) -{ - system("kill @outp[$i]"); -} diff --git a/x2goterminate-session b/x2goterminate-session deleted file mode 100755 index 0b4f83a..0000000 --- a/x2goterminate-session +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -if [ $# -eq 1 ]; then - SESSION_NAME=$1 -else - SESSION_NAME=$X2GO_SESSION -fi - -X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` -X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` - -x2gochangestatus 'F' $SESSION_NAME > /dev/null - -kill -TERM $X2GO_AGENT_PID -export HOSTNAME -x2goumount_session $SESSION_NAME diff --git a/x2goumount b/x2goumount deleted file mode 100755 index c24fbeb..0000000 --- a/x2goumount +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/perl -use strict; - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $fname=shift; -open(F,"<$fname") or die "can't open $fname"; -my $dir=<F>; -my $session=<F>; -close(F); - -$session=~s/\n//; - -chomp($dir); -my $uname=$ENV{'USER'}; - -my $use_zenity=0; - -if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") -{ - $use_zenity=1; -} - -if(system( "fusermount -u $dir" ) == 0) -{ - unlink($fname); - db_deletemount( $session, $dir); - rmdir ($dir); -} -else -{ - if($use_zenity == 0) - { - system("kdialog --error \"Can't umount:\n $dir\"&"); - } - else - { - system("zenity --error --text \"Can't umount:\n $dir\"&"); - } -} 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

nxproxy.git - build-main (branch) updated: 3.4.0.3-4-ge6b40d4
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via e6b40d420e7de2d9ab1a0657d835bcb6f957e351 (commit) via 4b35c3d9b82e0957f85bf2503bb339d888cb3b2c (commit) via 945164f919652c5a98da4a85d7922e32cbb74c74 (commit) via d870e934b235555a868132063530683654bbf7e8 (commit) from 06c9494d5f2ac258f268ef0987899484cdf9aec5 (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: CHANGELOG | 8 +++----- LICENSE | 2 +- Main.c | 2 +- VERSION | 2 +- debian/changelog | 6 ++++++ 5 files changed, 12 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/CHANGELOG b/CHANGELOG index ad92dc6..e5dff2e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,10 @@ ChangeLog: -nxproxy-3.4.0.2 +nxproxy-3.5.0-1 -- Adds make install/uninstall functionality. +- Opened the 3.5.0 branch based on nxproxy-3.4.0-2. -nxproxy-3.4.0.2 - -- Changed version numbering scheme, upstream now maintained by X2go project. +- Updated copyright to year 2011. nxproxy-3.4.0-2 diff --git a/LICENSE b/LICENSE index 4d4dc28..64522ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXPROXY and NX extensions to this software are copyright of NoMachine. Redistribution and use of this software is allowed according to the diff --git a/Main.c b/Main.c index 4fe65e8..48c6855 100644 --- a/Main.c +++ b/Main.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXPROXY, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/VERSION b/VERSION index f43b747..1545d96 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.0.3 +3.5.0 diff --git a/debian/changelog b/debian/changelog index 07bc1ca..3dee715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nxproxy (3.5.0-1-0~x2go1) unstable; urgency=low + + * New upstream version + + -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:45:13 +0200 + nxproxy (3.4.0.3-0~x2go2) lucid; urgency=low * Additional packaging changes (thanks to Stéphane Graber) hooks/post-receive -- nxproxy.git (NX Proxy tool) 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 "nxproxy.git" (NX Proxy tool).

1 0

nxcompshad.git - build-main (branch) updated: 3.4.0.4-4-g15da210
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via 15da210f5b7229481a08351174fa62fec0e540e7 (commit) via effcb18df9bb359dbd9a9f849b7b12c3c2253f76 (commit) via 04e1c44cfd5f58e418a71dfb07f5666c6005cda1 (commit) via 0c3ddddf98e725ace06f523ac406efd599d0cbb9 (commit) from ceda6a361ff962332dd4795b86b87665885f6867 (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: CHANGELOG | 11 +++++++---- Core.cpp | 2 +- Core.h | 2 +- Input.cpp | 2 +- Input.h | 2 +- LICENSE | 2 +- Logger.cpp | 2 +- Logger.h | 2 +- Makefile.in | 2 +- Manager.cpp | 2 +- Manager.h | 2 +- Misc.h | 2 +- Poller.h | 2 +- Regions.h | 2 +- Shadow.cpp | 2 +- Shadow.h | 2 +- Updater.cpp | 2 +- Updater.h | 2 +- VERSION | 3 +-- Win.cpp | 2 +- Win.h | 2 +- X11.cpp | 28 ++++++++++++++++++---------- X11.h | 2 +- debian/changelog | 12 ++++++++++++ debian/control | 1 + 25 files changed, 59 insertions(+), 36 deletions(-) mode change 100755 => 100644 Makefile.in The diff of changes is: diff --git a/CHANGELOG b/CHANGELOG index 9a6017a..3472a4a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,15 @@ ChangeLog: -nxcompshad-3.4.0.4 +nxcompshad-3.5.0-2 -- Adds make install/uninstall functionality +- Fixed TR03G02189. Now key combinations involving the Shift keys + are recognized correctly. -nxcompshad-3.4.0.3 +nxcompshad-3.5.0-1 -- Changed version number scheme, upstream now maintained by X2go project +- Opened the 3.5.0 branch based on nxcompshad-3.4.0-3. + +- Updated copyright to year 2011. nxcompshad-3.4.0-3 diff --git a/Core.cpp b/Core.cpp index 6052de6..6f94493 100644 --- a/Core.cpp +++ b/Core.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Core.h b/Core.h index b0a9943..9bc8a64 100644 --- a/Core.h +++ b/Core.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Input.cpp b/Input.cpp index 09e77a8..f9bf181 100644 --- a/Input.cpp +++ b/Input.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Input.h b/Input.h index 764508e..6250e79 100644 --- a/Input.h +++ b/Input.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/LICENSE b/LICENSE index 99d6e5c..2c7f95a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXCOMPSHAD and NX extensions to X are copyright of NoMachine. diff --git a/Logger.cpp b/Logger.cpp index 47e5e63..c367c5d 100644 --- a/Logger.cpp +++ b/Logger.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Logger.h b/Logger.h index 0a9cad9..94e4da8 100644 --- a/Logger.h +++ b/Logger.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Makefile.in b/Makefile.in old mode 100755 new mode 100644 index 1727d58..3e5df7d --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ############################################################################ # # -# Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. # +# Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. # # # # NXCOMP, NX protocol compression and NX extensions to this software # # are copyright of NoMachine. Redistribution and use of the present # diff --git a/Manager.cpp b/Manager.cpp index 38b92c2..ba9260a 100644 --- a/Manager.cpp +++ b/Manager.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Manager.h b/Manager.h index 6f87cdc..2677549 100644 --- a/Manager.h +++ b/Manager.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Misc.h b/Misc.h index 8069a5c..27f2670 100644 --- a/Misc.h +++ b/Misc.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Poller.h b/Poller.h index 914ba1d..4435b5b 100644 --- a/Poller.h +++ b/Poller.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Regions.h b/Regions.h index 8ea41ad..b9303dc 100644 --- a/Regions.h +++ b/Regions.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Shadow.cpp b/Shadow.cpp index 6f2856c..f9525ad 100644 --- a/Shadow.cpp +++ b/Shadow.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Shadow.h b/Shadow.h index ef65c0b..e1eddb9 100644 --- a/Shadow.h +++ b/Shadow.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Updater.cpp b/Updater.cpp index f1761ba..245c6ce 100644 --- a/Updater.cpp +++ b/Updater.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Updater.h b/Updater.h index 4bcaa91..daa26c1 100644 --- a/Updater.h +++ b/Updater.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/VERSION b/VERSION index 2e263ee..1545d96 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ -3.4.0.4 - +3.5.0 diff --git a/Win.cpp b/Win.cpp index 3f1e489..481cbca 100644 --- a/Win.cpp +++ b/Win.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Win.h b/Win.h index 72566b8..fe591ff 100644 --- a/Win.h +++ b/Win.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/X11.cpp b/X11.cpp index cb8f55f..2d1140f 100644 --- a/X11.cpp +++ b/X11.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -981,6 +981,7 @@ void Poller::handleKeyboardEvent(Display *display, XEvent *event) Bool isKeyPress = False; Bool isModifier = False; + Bool isShiftComb = False; Bool skip = False; if (event -> type == KeyPress) @@ -1048,19 +1049,26 @@ void Poller::handleKeyboardEvent(Display *display, XEvent *event) (!modeSwitchOn && !level3ShiftOn && !altROn) && !skip) { - keysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms, - shadowMinKey, shadowMapWidth, 1); - } + KeySym tempKeysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms, + shadowMinKey, shadowMapWidth, 1); - if ((!leftShiftOn && !rightShiftOn) && - (modeSwitchOn || level3ShiftOn || altROn)) + if (tempKeysym == 0) + { + isShiftComb = True; + } + else + { + keysym = tempKeysym; + } + } + else if ((!leftShiftOn && !rightShiftOn) && + (modeSwitchOn || level3ShiftOn || altROn)) { keysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms, shadowMinKey, shadowMapWidth, 2); } - - if ((leftShiftOn || rightShiftOn) && - (modeSwitchOn || level3ShiftOn || altROn)) + else if ((leftShiftOn || rightShiftOn) && + (modeSwitchOn || level3ShiftOn || altROn)) { keysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms, shadowMinKey, shadowMapWidth, 3); @@ -1103,7 +1111,7 @@ void Poller::handleKeyboardEvent(Display *display, XEvent *event) * Send fake modifier events. */ - if (!isModifier) + if (!isModifier && isShiftComb == False) { sendFakeModifierEvents(col, ((keysym >> 8) == 0) && (keysym >= XK_A) && (keysym <= XK_Z)); } diff --git a/X11.h b/X11.h index d34fd3d..2127542 100644 --- a/X11.h +++ b/X11.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/debian/changelog b/debian/changelog index c38e830..59f25ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +nxcompshad (3.5.0-2-0~x2go2) UNRELEASED; urgency=low + + * Add dh-autoreconf as build-dep + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 30 Jun 2011 17:51:34 +0200 + +nxcompshad (3.5.0-2-0~x2go1) unstable; urgency=low + + * New upstream version + + -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:51:58 +0200 + nxcompshad (3.4.0.4-0~x2go1) unstable; urgency=low * New upstream version (accepted debian patches) diff --git a/debian/control b/debian/control index 5f45586..457dd53 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: + dh-autoreconf, debhelper (>= 7.0.50), libxtst-dev, libxdamage-dev, hooks/post-receive -- nxcompshad.git (NX compshad library) 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 "nxcompshad.git" (NX compshad library).

1 0

nxcompext.git - build-main (branch) updated: 3.4.0.2-3-g75a05a6
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via 75a05a65fb014c9c058788dd242d633829b30ebc (commit) via 4aeb6343f5f3ff320d97bdd2b0839b9ccc516e50 (commit) via 64bf311d3c15bb48e24ee46ab7c8a00e2a52203c (commit) from 758ea1363e435d984ed6d5f077167c3ef64b56f5 (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: Alpha.c | 2 +- Alpha.h | 2 +- Bitmap.c | 2 +- Bitmap.h | 2 +- CHANGELOG | 8 +++----- Clean.c | 2 +- Clean.h | 2 +- Colormap.c | 2 +- Colormap.h | 2 +- Jpeg.c | 2 +- Jpeg.h | 2 +- LICENSE | 2 +- Makefile.in | 2 +- Mask.c | 2 +- Mask.h | 2 +- NXlib.c | 2 +- NXlib.h | 2 +- NXlibint.h | 2 +- Pgn.c | 2 +- Pgn.h | 2 +- Rgb.c | 2 +- Rgb.h | 2 +- Rle.c | 2 +- Rle.h | 2 +- VERSION | 3 +-- Z.c | 2 +- Z.h | 2 +- debian/changelog | 6 ++++++ 28 files changed, 35 insertions(+), 32 deletions(-) The diff of changes is: diff --git a/Alpha.c b/Alpha.c index 15bebca..ff922af 100644 --- a/Alpha.c +++ b/Alpha.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Alpha.h b/Alpha.h index d785cef..4e9cef4 100644 --- a/Alpha.h +++ b/Alpha.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Bitmap.c b/Bitmap.c index 1b67155..80f5c96 100644 --- a/Bitmap.c +++ b/Bitmap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Bitmap.h b/Bitmap.h index 211c956..f0074b4 100644 --- a/Bitmap.h +++ b/Bitmap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CHANGELOG b/CHANGELOG index de97f0a..941e9b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,10 @@ ChangeLog: -nxcompext-3.4.0.2 +nxcompext-3.5.0-1 -- Adds make install/uninstall functionality +- Opened the 3.5.0 branch based on nxcompext-3.4.0-1. -nxcompext-3.4.0.1 - -- Change of version numbering scheme, upstream code now maintained by X2go project +- Updated copyright to year 2011. nxcompext-3.4.0-1 diff --git a/Clean.c b/Clean.c index 2283d26..3ddacdb 100644 --- a/Clean.c +++ b/Clean.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Clean.h b/Clean.h index 3cf6543..16636dc 100644 --- a/Clean.h +++ b/Clean.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Colormap.c b/Colormap.c index d14b48a..5d40bf6 100644 --- a/Colormap.c +++ b/Colormap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Colormap.h b/Colormap.h index 0056257..3bf828c 100644 --- a/Colormap.h +++ b/Colormap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Jpeg.c b/Jpeg.c index 63c94ae..0eac08a 100644 --- a/Jpeg.c +++ b/Jpeg.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Jpeg.h b/Jpeg.h index 2121352..c62899b 100644 --- a/Jpeg.h +++ b/Jpeg.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/LICENSE b/LICENSE index 12eb657..87b3c0e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXCOMPEXT library and NX extensions to X are copyright of NoMachine. Redistribution and use of this software is allowed according to the diff --git a/Makefile.in b/Makefile.in index 1325e88..6895876 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ############################################################################ # # -# Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com. # +# Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com. # # # # NXCOMPEXT, NX protocol compression and NX extensions to this software # # are copyright of NoMachine. Redistribution and use of the present # diff --git a/Mask.c b/Mask.c index 980b700..2427de2 100644 --- a/Mask.c +++ b/Mask.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Mask.h b/Mask.h index 35d23c6..180edea 100644 --- a/Mask.h +++ b/Mask.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXlib.c b/NXlib.c index 5c68fb7..f8a81b6 100644 --- a/NXlib.c +++ b/NXlib.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXlib.h b/NXlib.h index 497ac5b..6d7895d 100644 --- a/NXlib.h +++ b/NXlib.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXlibint.h b/NXlibint.h index de1a3df..c96a596 100644 --- a/NXlibint.h +++ b/NXlibint.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pgn.c b/Pgn.c index 31337cf..609ff95 100644 --- a/Pgn.c +++ b/Pgn.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pgn.h b/Pgn.h index 6f84188..8de35c6 100644 --- a/Pgn.h +++ b/Pgn.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rgb.c b/Rgb.c index 7a3dddd..9cf03b4 100644 --- a/Rgb.c +++ b/Rgb.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rgb.h b/Rgb.h index 499509a..8fd33f3 100644 --- a/Rgb.h +++ b/Rgb.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rle.c b/Rle.c index 1fb46e8..45f177c 100644 --- a/Rle.c +++ b/Rle.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rle.h b/Rle.h index cfc2d6d..a41cf5c 100644 --- a/Rle.h +++ b/Rle.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/VERSION b/VERSION index 261f9ad..1545d96 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ -3.4.0.2 - +3.5.0 diff --git a/Z.c b/Z.c index 8593f2a..c28a990 100644 --- a/Z.c +++ b/Z.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Z.h b/Z.h index 53dd3d7..04f5384 100644 --- a/Z.h +++ b/Z.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPEXT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/debian/changelog b/debian/changelog index 7df16f0..f8908d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nxcompext (1:3.5.0-1-0~x2go1) unstable; urgency=low + + * New upstream version + + -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:49:59 +0200 + nxcompext (1:3.4.0.2-0~x2go1) unstable; urgency=low * new upstream version: hooks/post-receive -- nxcompext.git (NX compext library) 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 "nxcompext.git" (NX compext library).

1 0

nxcomp.git - build-main (branch) updated: 3.4.0.8-3-g96c3f69
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via 96c3f6971305e2562fff8bf27c57a18d9f0c951e (commit) via 23a52302aaed9ba93f74c03f4cc8397025dc505c (commit) via f01fa8f0ac73c86195391bfcded155176354e25a (commit) from f5184235e876daa03239e0ae792cea8569f1dcfc (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: ActionCache.cpp | 2 +- ActionCache.h | 2 +- ActionCacheCompat.h | 2 +- Agent.cpp | 2 +- Agent.h | 2 +- Alpha.cpp | 2 +- Alpha.h | 2 +- Auth.cpp | 2 +- Auth.h | 2 +- Bitmap.cpp | 2 +- Bitmap.h | 2 +- BlockCache.cpp | 2 +- BlockCache.h | 2 +- BlockCacheSet.cpp | 2 +- BlockCacheSet.h | 2 +- CHANGELOG | 8 +++----- ChangeGC.cpp | 2 +- ChangeGC.h | 2 +- ChangeGCCompat.cpp | 2 +- ChangeGCCompat.h | 2 +- ChangeProperty.cpp | 2 +- ChangeProperty.h | 2 +- Channel.cpp | 2 +- Channel.h | 2 +- ChannelCache.cpp | 2 +- ChannelCache.h | 2 +- ChannelStore.h | 2 +- CharCache.cpp | 2 +- CharCache.h | 2 +- Children.cpp | 2 +- ClearArea.cpp | 2 +- ClearArea.h | 2 +- ClientCache.cpp | 2 +- ClientCache.h | 2 +- ClientChannel.cpp | 2 +- ClientChannel.h | 2 +- ClientProxy.cpp | 2 +- ClientProxy.h | 2 +- ClientReadBuffer.cpp | 2 +- ClientReadBuffer.h | 2 +- ClientStore.cpp | 2 +- ClientStore.h | 2 +- Colormap.cpp | 2 +- Colormap.h | 2 +- ConfigureWindow.cpp | 2 +- ConfigureWindow.h | 2 +- Control.cpp | 2 +- Control.h | 2 +- CopyArea.cpp | 2 +- CopyArea.h | 2 +- CreateGC.cpp | 2 +- CreateGC.h | 2 +- CreatePixmap.cpp | 2 +- CreatePixmap.h | 2 +- CreatePixmapCompat.cpp | 2 +- CreatePixmapCompat.h | 2 +- DecodeBuffer.cpp | 2 +- DecodeBuffer.h | 2 +- EncodeBuffer.cpp | 2 +- EncodeBuffer.h | 2 +- FillPoly.cpp | 2 +- FillPoly.h | 2 +- Fork.cpp | 2 +- Fork.h | 2 +- FreeCache.h | 2 +- GenericChannel.cpp | 2 +- GenericChannel.h | 2 +- GenericReadBuffer.cpp | 2 +- GenericReadBuffer.h | 2 +- GenericReply.cpp | 2 +- GenericReply.h | 2 +- GenericRequest.cpp | 2 +- GenericRequest.h | 2 +- GetImage.cpp | 2 +- GetImage.h | 2 +- GetImageReply.cpp | 2 +- GetImageReply.h | 2 +- GetProperty.cpp | 2 +- GetProperty.h | 2 +- GetPropertyReply.cpp | 2 +- GetPropertyReply.h | 2 +- ImageText16.cpp | 2 +- ImageText16.h | 2 +- ImageText8.cpp | 2 +- ImageText8.h | 2 +- IntCache.cpp | 2 +- IntCache.h | 2 +- InternAtom.cpp | 2 +- InternAtom.h | 2 +- Jpeg.cpp | 2 +- Jpeg.h | 2 +- Keeper.cpp | 2 +- Keeper.h | 2 +- LICENSE | 2 +- List.cpp | 2 +- List.h | 2 +- ListFontsReply.cpp | 2 +- ListFontsReply.h | 2 +- Loop.cpp | 4 ++-- Makefile.in | 2 +- Message.cpp | 2 +- Message.h | 2 +- Misc.cpp | 4 ++-- Misc.h | 2 +- NX.h | 2 +- NXalert.h | 2 +- NXmitshm.h | 2 +- NXpack.h | 2 +- NXproto.h | 2 +- NXrender.h | 2 +- NXvars.h | 2 +- OpcodeCache.h | 2 +- OpcodeStore.cpp | 2 +- OpcodeStore.h | 2 +- Pack.c | 2 +- Pgn.cpp | 2 +- Pgn.h | 2 +- Pipe.cpp | 2 +- Pipe.h | 2 +- PolyArc.cpp | 2 +- PolyArc.h | 2 +- PolyFillArc.cpp | 2 +- PolyFillArc.h | 2 +- PolyFillRectangle.cpp | 2 +- PolyFillRectangle.h | 2 +- PolyLine.cpp | 2 +- PolyLine.h | 2 +- PolyPoint.cpp | 2 +- PolyPoint.h | 2 +- PolySegment.cpp | 2 +- PolySegment.h | 2 +- PolyText16.cpp | 2 +- PolyText16.h | 2 +- PolyText8.cpp | 2 +- PolyText8.h | 2 +- PositionCacheCompat.cpp | 2 +- PositionCacheCompat.h | 2 +- Proxy.cpp | 2 +- Proxy.h | 2 +- ProxyReadBuffer.cpp | 2 +- ProxyReadBuffer.h | 2 +- PutImage.cpp | 2 +- PutImage.h | 2 +- PutPackedImage.cpp | 2 +- PutPackedImage.h | 2 +- QueryFontReply.cpp | 2 +- QueryFontReply.h | 2 +- ReadBuffer.cpp | 2 +- ReadBuffer.h | 2 +- RenderAddGlyphs.cpp | 2 +- RenderAddGlyphs.h | 2 +- RenderChangePicture.cpp | 2 +- RenderChangePicture.h | 2 +- RenderComposite.cpp | 2 +- RenderComposite.h | 2 +- RenderCompositeCompat.cpp | 2 +- RenderCompositeCompat.h | 2 +- RenderCompositeGlyphs.cpp | 2 +- RenderCompositeGlyphs.h | 2 +- RenderCompositeGlyphsCompat.cpp | 2 +- RenderCompositeGlyphsCompat.h | 2 +- RenderCreateGlyphSet.cpp | 2 +- RenderCreateGlyphSet.h | 2 +- RenderCreateGlyphSetCompat.cpp | 2 +- RenderCreateGlyphSetCompat.h | 2 +- RenderCreatePicture.cpp | 2 +- RenderCreatePicture.h | 2 +- RenderCreatePictureCompat.cpp | 2 +- RenderCreatePictureCompat.h | 2 +- RenderExtension.cpp | 2 +- RenderExtension.h | 2 +- RenderFillRectangles.cpp | 2 +- RenderFillRectangles.h | 2 +- RenderFreeGlyphSet.cpp | 2 +- RenderFreeGlyphSet.h | 2 +- RenderFreePicture.cpp | 2 +- RenderFreePicture.h | 2 +- RenderFreePictureCompat.cpp | 2 +- RenderFreePictureCompat.h | 2 +- RenderGenericRequest.cpp | 2 +- RenderGenericRequest.h | 2 +- RenderMinorExtensionHeaders.h | 2 +- RenderMinorExtensionMethods.h | 2 +- RenderMinorExtensionTags.h | 2 +- RenderPictureClip.cpp | 2 +- RenderPictureClip.h | 2 +- RenderPictureClipCompat.cpp | 2 +- RenderPictureClipCompat.h | 2 +- RenderPictureFilter.cpp | 2 +- RenderPictureFilter.h | 2 +- RenderPictureTransform.cpp | 2 +- RenderPictureTransform.h | 2 +- RenderTrapezoids.cpp | 2 +- RenderTrapezoids.h | 2 +- RenderTriangles.cpp | 2 +- RenderTriangles.h | 2 +- Rgb.cpp | 2 +- Rgb.h | 2 +- Rle.cpp | 2 +- Rle.h | 2 +- SendEvent.cpp | 2 +- SendEvent.h | 2 +- SequenceQueue.cpp | 2 +- SequenceQueue.h | 2 +- ServerCache.cpp | 2 +- ServerCache.h | 2 +- ServerChannel.cpp | 2 +- ServerChannel.h | 2 +- ServerProxy.cpp | 2 +- ServerProxy.h | 2 +- ServerReadBuffer.cpp | 2 +- ServerReadBuffer.h | 2 +- ServerStore.cpp | 2 +- ServerStore.h | 2 +- SetClipRectangles.cpp | 2 +- SetClipRectangles.h | 2 +- SetUnpackAlpha.cpp | 2 +- SetUnpackAlpha.h | 2 +- SetUnpackAlphaCompat.cpp | 2 +- SetUnpackAlphaCompat.h | 2 +- SetUnpackColormap.cpp | 2 +- SetUnpackColormap.h | 2 +- SetUnpackColormapCompat.cpp | 2 +- SetUnpackColormapCompat.h | 2 +- SetUnpackGeometry.cpp | 2 +- SetUnpackGeometry.h | 2 +- ShapeExtension.cpp | 2 +- ShapeExtension.h | 2 +- Socket.cpp | 2 +- Socket.h | 2 +- Split.cpp | 2 +- Split.h | 2 +- StaticCompressor.cpp | 2 +- StaticCompressor.h | 2 +- Statistics.cpp | 2 +- Statistics.h | 2 +- TextCompressor.cpp | 2 +- TextCompressor.h | 2 +- Timestamp.cpp | 2 +- Timestamp.h | 2 +- TranslateCoords.cpp | 2 +- TranslateCoords.h | 2 +- Transport.cpp | 2 +- Transport.h | 2 +- Types.h | 2 +- Unpack.cpp | 2 +- Unpack.h | 2 +- Utils.cpp | 2 +- VERSION | 2 +- Vars.c | 2 +- WriteBuffer.cpp | 2 +- WriteBuffer.h | 2 +- XidCache.cpp | 2 +- XidCache.h | 2 +- Z.cpp | 2 +- Z.h | 2 +- debian/changelog | 6 ++++++ 257 files changed, 266 insertions(+), 262 deletions(-) The diff of changes is: diff --git a/ActionCache.cpp b/ActionCache.cpp index 79b6700..deafcb6 100644 --- a/ActionCache.cpp +++ b/ActionCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ActionCache.h b/ActionCache.h index 23265fc..4d2d57d 100644 --- a/ActionCache.h +++ b/ActionCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ActionCacheCompat.h b/ActionCacheCompat.h index 8281db8..9bc76ed 100644 --- a/ActionCacheCompat.h +++ b/ActionCacheCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Agent.cpp b/Agent.cpp index c0b729d..6bf9412 100644 --- a/Agent.cpp +++ b/Agent.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Agent.h b/Agent.h index fac5acd..f2a9274 100644 --- a/Agent.h +++ b/Agent.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Alpha.cpp b/Alpha.cpp index 9311014..ca8d7eb 100644 --- a/Alpha.cpp +++ b/Alpha.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Alpha.h b/Alpha.h index 80620e1..fe62cfb 100644 --- a/Alpha.h +++ b/Alpha.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Auth.cpp b/Auth.cpp index d8e9991..85a8450 100644 --- a/Auth.cpp +++ b/Auth.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Auth.h b/Auth.h index aac1d1e..0599510 100644 --- a/Auth.h +++ b/Auth.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Bitmap.cpp b/Bitmap.cpp index b5bad22..e7bbdb5 100644 --- a/Bitmap.cpp +++ b/Bitmap.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Bitmap.h b/Bitmap.h index 57a1b35..2d24b48 100644 --- a/Bitmap.h +++ b/Bitmap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/BlockCache.cpp b/BlockCache.cpp index f885290..b665deb 100644 --- a/BlockCache.cpp +++ b/BlockCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/BlockCache.h b/BlockCache.h index b9146ce..79c7dbe 100644 --- a/BlockCache.h +++ b/BlockCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/BlockCacheSet.cpp b/BlockCacheSet.cpp index 8959ba2..c77b95b 100644 --- a/BlockCacheSet.cpp +++ b/BlockCacheSet.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/BlockCacheSet.h b/BlockCacheSet.h index e27b180..c9df49f 100644 --- a/BlockCacheSet.h +++ b/BlockCacheSet.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CHANGELOG b/CHANGELOG index bc6adb3..df10c85 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,10 @@ ChangeLog: -nxcomp-3.4.0.8 +nxcomp-3.5.0-1 -- Providing make install/uninstall functionality +- Opened the 3.5.0 branch based on nxcomp-3.4.0-7. -nxcomp-3.4.0.7 - -- Change of version numbering scheme, upstream maintained by X2go project now +- Updated copyright to year 2011. nxcomp-3.4.0-7 diff --git a/ChangeGC.cpp b/ChangeGC.cpp index 5746517..90fe8d1 100644 --- a/ChangeGC.cpp +++ b/ChangeGC.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChangeGC.h b/ChangeGC.h index 81b808d..24f1ba2 100644 --- a/ChangeGC.h +++ b/ChangeGC.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChangeGCCompat.cpp b/ChangeGCCompat.cpp index ca29737..77a2d03 100644 --- a/ChangeGCCompat.cpp +++ b/ChangeGCCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChangeGCCompat.h b/ChangeGCCompat.h index 3a7b0c0..08a4b0c 100644 --- a/ChangeGCCompat.h +++ b/ChangeGCCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChangeProperty.cpp b/ChangeProperty.cpp index 0270d72..7f50685 100644 --- a/ChangeProperty.cpp +++ b/ChangeProperty.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChangeProperty.h b/ChangeProperty.h index f941fce..aba50bd 100644 --- a/ChangeProperty.h +++ b/ChangeProperty.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Channel.cpp b/Channel.cpp index 71b556b..e140bac 100644 --- a/Channel.cpp +++ b/Channel.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Channel.h b/Channel.h index 68fe1d7..2b7fe68 100644 --- a/Channel.h +++ b/Channel.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChannelCache.cpp b/ChannelCache.cpp index eaf8e42..5d5fd73 100644 --- a/ChannelCache.cpp +++ b/ChannelCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChannelCache.h b/ChannelCache.h index 7b94893..7392ae5 100644 --- a/ChannelCache.h +++ b/ChannelCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ChannelStore.h b/ChannelStore.h index 3103fb3..77334d8 100644 --- a/ChannelStore.h +++ b/ChannelStore.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CharCache.cpp b/CharCache.cpp index 2803a1b..6b78c68 100644 --- a/CharCache.cpp +++ b/CharCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CharCache.h b/CharCache.h index 53710f1..94ed350 100644 --- a/CharCache.h +++ b/CharCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Children.cpp b/Children.cpp index a19b882..c7431c4 100644 --- a/Children.cpp +++ b/Children.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClearArea.cpp b/ClearArea.cpp index 223a3b3..6cea52d 100644 --- a/ClearArea.cpp +++ b/ClearArea.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClearArea.h b/ClearArea.h index 039eea4..569f0bc 100644 --- a/ClearArea.h +++ b/ClearArea.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientCache.cpp b/ClientCache.cpp index 2a82009..1fcb1f4 100644 --- a/ClientCache.cpp +++ b/ClientCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientCache.h b/ClientCache.h index 6702e5b..db33c1d 100644 --- a/ClientCache.h +++ b/ClientCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientChannel.cpp b/ClientChannel.cpp index 31d6d12..8a83df5 100644 --- a/ClientChannel.cpp +++ b/ClientChannel.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientChannel.h b/ClientChannel.h index 9924bb2..af4e2fa 100644 --- a/ClientChannel.h +++ b/ClientChannel.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientProxy.cpp b/ClientProxy.cpp index ef63bb0..7fb024c 100644 --- a/ClientProxy.cpp +++ b/ClientProxy.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientProxy.h b/ClientProxy.h index 2b669ba..14eeaa8 100644 --- a/ClientProxy.h +++ b/ClientProxy.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientReadBuffer.cpp b/ClientReadBuffer.cpp index b32033b..6750835 100644 --- a/ClientReadBuffer.cpp +++ b/ClientReadBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientReadBuffer.h b/ClientReadBuffer.h index 6dee630..98b7e70 100644 --- a/ClientReadBuffer.h +++ b/ClientReadBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientStore.cpp b/ClientStore.cpp index be0e892..f95a8d6 100644 --- a/ClientStore.cpp +++ b/ClientStore.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ClientStore.h b/ClientStore.h index 54a68a3..2efb343 100644 --- a/ClientStore.h +++ b/ClientStore.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Colormap.cpp b/Colormap.cpp index 5702bec..21916c1 100644 --- a/Colormap.cpp +++ b/Colormap.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Colormap.h b/Colormap.h index e0056f8..05a4309 100644 --- a/Colormap.h +++ b/Colormap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ConfigureWindow.cpp b/ConfigureWindow.cpp index 995ab18..eb8f990 100644 --- a/ConfigureWindow.cpp +++ b/ConfigureWindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ConfigureWindow.h b/ConfigureWindow.h index bb511b0..353a257 100644 --- a/ConfigureWindow.h +++ b/ConfigureWindow.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Control.cpp b/Control.cpp index ce99567..d032eae 100644 --- a/Control.cpp +++ b/Control.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Control.h b/Control.h index c214775..b6ed0cf 100644 --- a/Control.h +++ b/Control.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CopyArea.cpp b/CopyArea.cpp index e384ce1..9ebfbad 100644 --- a/CopyArea.cpp +++ b/CopyArea.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CopyArea.h b/CopyArea.h index a811f38..895e6ed 100644 --- a/CopyArea.h +++ b/CopyArea.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CreateGC.cpp b/CreateGC.cpp index f1c10e6..5694e9b 100644 --- a/CreateGC.cpp +++ b/CreateGC.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CreateGC.h b/CreateGC.h index b77f13c..94e4325 100644 --- a/CreateGC.h +++ b/CreateGC.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CreatePixmap.cpp b/CreatePixmap.cpp index 4037867..4c48a07 100644 --- a/CreatePixmap.cpp +++ b/CreatePixmap.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CreatePixmap.h b/CreatePixmap.h index 1d742e4..b76aae7 100644 --- a/CreatePixmap.h +++ b/CreatePixmap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CreatePixmapCompat.cpp b/CreatePixmapCompat.cpp index 6ea346e..f0f8756 100644 --- a/CreatePixmapCompat.cpp +++ b/CreatePixmapCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/CreatePixmapCompat.h b/CreatePixmapCompat.h index e8cf8d9..d310597 100644 --- a/CreatePixmapCompat.h +++ b/CreatePixmapCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/DecodeBuffer.cpp b/DecodeBuffer.cpp index 077bfdf..96a7799 100644 --- a/DecodeBuffer.cpp +++ b/DecodeBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/DecodeBuffer.h b/DecodeBuffer.h index 9345f4e..ac815ff 100644 --- a/DecodeBuffer.h +++ b/DecodeBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/EncodeBuffer.cpp b/EncodeBuffer.cpp index 466a1d7..dc31478 100644 --- a/EncodeBuffer.cpp +++ b/EncodeBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/EncodeBuffer.h b/EncodeBuffer.h index 9f5ac53..c33ec14 100644 --- a/EncodeBuffer.h +++ b/EncodeBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/FillPoly.cpp b/FillPoly.cpp index 37df377..b4337fc 100644 --- a/FillPoly.cpp +++ b/FillPoly.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/FillPoly.h b/FillPoly.h index f339684..b52bb03 100644 --- a/FillPoly.h +++ b/FillPoly.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Fork.cpp b/Fork.cpp index 48faa29..cb77b1a 100644 --- a/Fork.cpp +++ b/Fork.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Fork.h b/Fork.h index 9df9f40..98afdcc 100644 --- a/Fork.h +++ b/Fork.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/FreeCache.h b/FreeCache.h index 01fa42c..c67c503 100644 --- a/FreeCache.h +++ b/FreeCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericChannel.cpp b/GenericChannel.cpp index 641ad36..71928dc 100644 --- a/GenericChannel.cpp +++ b/GenericChannel.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericChannel.h b/GenericChannel.h index ba4f1e7..d068a87 100644 --- a/GenericChannel.h +++ b/GenericChannel.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericReadBuffer.cpp b/GenericReadBuffer.cpp index b7b6d93..77c01fe 100644 --- a/GenericReadBuffer.cpp +++ b/GenericReadBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericReadBuffer.h b/GenericReadBuffer.h index 6b1fdd1..722f8b0 100644 --- a/GenericReadBuffer.h +++ b/GenericReadBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericReply.cpp b/GenericReply.cpp index 9daccc5..8095fc1 100644 --- a/GenericReply.cpp +++ b/GenericReply.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericReply.h b/GenericReply.h index de97b86..6c83e3c 100644 --- a/GenericReply.h +++ b/GenericReply.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericRequest.cpp b/GenericRequest.cpp index 4007729..301485e 100644 --- a/GenericRequest.cpp +++ b/GenericRequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GenericRequest.h b/GenericRequest.h index 3175fc2..aa41106 100644 --- a/GenericRequest.h +++ b/GenericRequest.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetImage.cpp b/GetImage.cpp index 6be574d..b4150c6 100644 --- a/GetImage.cpp +++ b/GetImage.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetImage.h b/GetImage.h index f48fb90..7dee68f 100644 --- a/GetImage.h +++ b/GetImage.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetImageReply.cpp b/GetImageReply.cpp index d4bc21b..9144b08 100644 --- a/GetImageReply.cpp +++ b/GetImageReply.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetImageReply.h b/GetImageReply.h index ee7b0bf..76bbb38 100644 --- a/GetImageReply.h +++ b/GetImageReply.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetProperty.cpp b/GetProperty.cpp index d358f8a..c8cea02 100644 --- a/GetProperty.cpp +++ b/GetProperty.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetProperty.h b/GetProperty.h index a734253..e6377a3 100644 --- a/GetProperty.h +++ b/GetProperty.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetPropertyReply.cpp b/GetPropertyReply.cpp index 2231318..964093d 100644 --- a/GetPropertyReply.cpp +++ b/GetPropertyReply.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/GetPropertyReply.h b/GetPropertyReply.h index 0f6b195..fb29a6f 100644 --- a/GetPropertyReply.h +++ b/GetPropertyReply.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ImageText16.cpp b/ImageText16.cpp index 569fdbe..b3e517b 100644 --- a/ImageText16.cpp +++ b/ImageText16.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ImageText16.h b/ImageText16.h index 0e116a4..abaf798 100644 --- a/ImageText16.h +++ b/ImageText16.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ImageText8.cpp b/ImageText8.cpp index 1619776..0a60995 100644 --- a/ImageText8.cpp +++ b/ImageText8.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ImageText8.h b/ImageText8.h index c56502f..1610c59 100644 --- a/ImageText8.h +++ b/ImageText8.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/IntCache.cpp b/IntCache.cpp index 8262d56..0bb2df4 100644 --- a/IntCache.cpp +++ b/IntCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/IntCache.h b/IntCache.h index 15cc8ea..2b174cc 100644 --- a/IntCache.h +++ b/IntCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/InternAtom.cpp b/InternAtom.cpp index d90c8c0..67ed2fe 100644 --- a/InternAtom.cpp +++ b/InternAtom.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/InternAtom.h b/InternAtom.h index f7f366d..168dac1 100644 --- a/InternAtom.h +++ b/InternAtom.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Jpeg.cpp b/Jpeg.cpp index b397322..885b1cb 100644 --- a/Jpeg.cpp +++ b/Jpeg.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Jpeg.h b/Jpeg.h index f3743d0..9abfc89 100644 --- a/Jpeg.h +++ b/Jpeg.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Keeper.cpp b/Keeper.cpp index fd9b79f..382f8c7 100644 --- a/Keeper.cpp +++ b/Keeper.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Keeper.h b/Keeper.h index c357b21..7d31d6a 100644 --- a/Keeper.h +++ b/Keeper.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/LICENSE b/LICENSE index 2b32034..c6e3a0f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXCOMP library and NX extensions to X are copyright of NoMachine. Redistribution and use of this software is allowed according to the diff --git a/List.cpp b/List.cpp index 1ba104b..69b940a 100644 --- a/List.cpp +++ b/List.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/List.h b/List.h index b5e41ae..8169d7d 100644 --- a/List.h +++ b/List.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ListFontsReply.cpp b/ListFontsReply.cpp index 5bace82..3932120 100644 --- a/ListFontsReply.cpp +++ b/ListFontsReply.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ListFontsReply.h b/ListFontsReply.h index 078fd7e..9fbb8a8 100644 --- a/ListFontsReply.h +++ b/ListFontsReply.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Loop.cpp b/Loop.cpp index ba54d38..76622d8 100644 --- a/Loop.cpp +++ b/Loop.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -13934,7 +13934,7 @@ void PrintProcessInfo() << "." << control -> LocalVersionMinor << "." << control -> LocalVersionPatch << "\n\n"; - cerr << "Copyright (C) 2001, 2010 NoMachine.\n" + cerr << "Copyright (C) 2001, 2011 NoMachine.\n" << "See http://www.nomachine.com/ for more information.\n\n"; } diff --git a/Makefile.in b/Makefile.in index b86a816..6f9e6ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ############################################################################ # # -# Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. # +# Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. # # # # NXCOMP, NX protocol compression and NX extensions to this software # # are copyright of NoMachine. Redistribution and use of the present # diff --git a/Message.cpp b/Message.cpp index 72d4fff..a2de5a3 100644 --- a/Message.cpp +++ b/Message.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Message.h b/Message.h index dcfff7c..6682495 100644 --- a/Message.h +++ b/Message.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Misc.cpp b/Misc.cpp index 2c72259..b79998c 100644 --- a/Misc.cpp +++ b/Misc.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -371,7 +371,7 @@ const char *GetUsageInfo() static const char CopyrightInfo[] = "\ -Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\ +Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.\n\ \n\ NXCOMP, NX protocol compression and NX extensions to this software \n\ are copyright of NoMachine. Redistribution and use of the present\n\ diff --git a/Misc.h b/Misc.h index 2008317..f95b8a4 100644 --- a/Misc.h +++ b/Misc.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NX.h b/NX.h index d98af79..5e2778f 100644 --- a/NX.h +++ b/NX.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXalert.h b/NXalert.h index 2f01a30..8f7e428 100644 --- a/NXalert.h +++ b/NXalert.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXmitshm.h b/NXmitshm.h index aa79ec8..e2cb665 100644 --- a/NXmitshm.h +++ b/NXmitshm.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXpack.h b/NXpack.h index de1c0f0..dc98f4c 100644 --- a/NXpack.h +++ b/NXpack.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXproto.h b/NXproto.h index ce25cc4..567c5d6 100644 --- a/NXproto.h +++ b/NXproto.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXrender.h b/NXrender.h index bc359f2..797c8e8 100644 --- a/NXrender.h +++ b/NXrender.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/NXvars.h b/NXvars.h index 09dfb77..a20d235 100644 --- a/NXvars.h +++ b/NXvars.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/OpcodeCache.h b/OpcodeCache.h index 529f8ee..086a584 100644 --- a/OpcodeCache.h +++ b/OpcodeCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/OpcodeStore.cpp b/OpcodeStore.cpp index 9097448..409ed8a 100644 --- a/OpcodeStore.cpp +++ b/OpcodeStore.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/OpcodeStore.h b/OpcodeStore.h index f6626df..52eba28 100644 --- a/OpcodeStore.h +++ b/OpcodeStore.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pack.c b/Pack.c index 59a54cf..f6e754f 100644 --- a/Pack.c +++ b/Pack.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pgn.cpp b/Pgn.cpp index a683734..faaed8d 100644 --- a/Pgn.cpp +++ b/Pgn.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pgn.h b/Pgn.h index ddf9b75..246fd92 100644 --- a/Pgn.h +++ b/Pgn.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pipe.cpp b/Pipe.cpp index 7238d0c..43a1081 100644 --- a/Pipe.cpp +++ b/Pipe.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Pipe.h b/Pipe.h index b4563a9..7b720e2 100644 --- a/Pipe.h +++ b/Pipe.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyArc.cpp b/PolyArc.cpp index e572fa4..8237ea4 100644 --- a/PolyArc.cpp +++ b/PolyArc.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyArc.h b/PolyArc.h index 50d2fd9..4d37028 100644 --- a/PolyArc.h +++ b/PolyArc.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyFillArc.cpp b/PolyFillArc.cpp index 2733eb6..d425cfc 100644 --- a/PolyFillArc.cpp +++ b/PolyFillArc.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyFillArc.h b/PolyFillArc.h index 721f5ac..b09b5ed 100644 --- a/PolyFillArc.h +++ b/PolyFillArc.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyFillRectangle.cpp b/PolyFillRectangle.cpp index e1e6b78..be05ee5 100644 --- a/PolyFillRectangle.cpp +++ b/PolyFillRectangle.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyFillRectangle.h b/PolyFillRectangle.h index bf94c48..2dd3f6d 100644 --- a/PolyFillRectangle.h +++ b/PolyFillRectangle.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyLine.cpp b/PolyLine.cpp index 4d285e0..49d1e0a 100644 --- a/PolyLine.cpp +++ b/PolyLine.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyLine.h b/PolyLine.h index 39447e6..e66c8e3 100644 --- a/PolyLine.h +++ b/PolyLine.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyPoint.cpp b/PolyPoint.cpp index 847300f..5a55f4c 100644 --- a/PolyPoint.cpp +++ b/PolyPoint.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyPoint.h b/PolyPoint.h index e090ff9..a462c58 100644 --- a/PolyPoint.h +++ b/PolyPoint.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolySegment.cpp b/PolySegment.cpp index e9259d9..e5259e8 100644 --- a/PolySegment.cpp +++ b/PolySegment.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolySegment.h b/PolySegment.h index a748658..cb53f6d 100644 --- a/PolySegment.h +++ b/PolySegment.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyText16.cpp b/PolyText16.cpp index d90b093..ebcf9fe 100644 --- a/PolyText16.cpp +++ b/PolyText16.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyText16.h b/PolyText16.h index cda6cce..4928912 100644 --- a/PolyText16.h +++ b/PolyText16.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyText8.cpp b/PolyText8.cpp index 1575272..537f1ad 100644 --- a/PolyText8.cpp +++ b/PolyText8.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PolyText8.h b/PolyText8.h index eac5aab..efe928d 100644 --- a/PolyText8.h +++ b/PolyText8.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PositionCacheCompat.cpp b/PositionCacheCompat.cpp index 4a6a2cd..ad2d634 100644 --- a/PositionCacheCompat.cpp +++ b/PositionCacheCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PositionCacheCompat.h b/PositionCacheCompat.h index 983e453..c9db60e 100644 --- a/PositionCacheCompat.h +++ b/PositionCacheCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Proxy.cpp b/Proxy.cpp index 347dd5a..f88259f 100644 --- a/Proxy.cpp +++ b/Proxy.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Proxy.h b/Proxy.h index 3d6c62c..a26c4dc 100644 --- a/Proxy.h +++ b/Proxy.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ProxyReadBuffer.cpp b/ProxyReadBuffer.cpp index b0de149..16a1d59 100644 --- a/ProxyReadBuffer.cpp +++ b/ProxyReadBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ProxyReadBuffer.h b/ProxyReadBuffer.h index b87b215..b5a7070 100644 --- a/ProxyReadBuffer.h +++ b/ProxyReadBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PutImage.cpp b/PutImage.cpp index 325a4aa..fbc0035 100644 --- a/PutImage.cpp +++ b/PutImage.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PutImage.h b/PutImage.h index e9535cb..c97e71a 100644 --- a/PutImage.h +++ b/PutImage.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PutPackedImage.cpp b/PutPackedImage.cpp index eae16a1..64056c0 100644 --- a/PutPackedImage.cpp +++ b/PutPackedImage.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/PutPackedImage.h b/PutPackedImage.h index 5287a5b..145f8e1 100644 --- a/PutPackedImage.h +++ b/PutPackedImage.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/QueryFontReply.cpp b/QueryFontReply.cpp index 2d42587..59cc1ec 100644 --- a/QueryFontReply.cpp +++ b/QueryFontReply.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/QueryFontReply.h b/QueryFontReply.h index 537da4e..ae3ff58 100644 --- a/QueryFontReply.h +++ b/QueryFontReply.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ReadBuffer.cpp b/ReadBuffer.cpp index 13122e2..488c72a 100644 --- a/ReadBuffer.cpp +++ b/ReadBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ReadBuffer.h b/ReadBuffer.h index 2013012..13acdaa 100644 --- a/ReadBuffer.h +++ b/ReadBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderAddGlyphs.cpp b/RenderAddGlyphs.cpp index 1d53ec0..e28c477 100644 --- a/RenderAddGlyphs.cpp +++ b/RenderAddGlyphs.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderAddGlyphs.h b/RenderAddGlyphs.h index 918a70c..96001f9 100644 --- a/RenderAddGlyphs.h +++ b/RenderAddGlyphs.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderChangePicture.cpp b/RenderChangePicture.cpp index 5dbe39d..831ab17 100644 --- a/RenderChangePicture.cpp +++ b/RenderChangePicture.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderChangePicture.h b/RenderChangePicture.h index e6a89a6..1308e2f 100644 --- a/RenderChangePicture.h +++ b/RenderChangePicture.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderComposite.cpp b/RenderComposite.cpp index e3c121b..578860e 100644 --- a/RenderComposite.cpp +++ b/RenderComposite.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderComposite.h b/RenderComposite.h index 91fa30a..81dc727 100644 --- a/RenderComposite.h +++ b/RenderComposite.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCompositeCompat.cpp b/RenderCompositeCompat.cpp index 5a1eff2..04e08c1 100644 --- a/RenderCompositeCompat.cpp +++ b/RenderCompositeCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCompositeCompat.h b/RenderCompositeCompat.h index a26db35..94c960a 100644 --- a/RenderCompositeCompat.h +++ b/RenderCompositeCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCompositeGlyphs.cpp b/RenderCompositeGlyphs.cpp index 1135633..b5b08c3 100644 --- a/RenderCompositeGlyphs.cpp +++ b/RenderCompositeGlyphs.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCompositeGlyphs.h b/RenderCompositeGlyphs.h index 527fd3d..ad9251a 100644 --- a/RenderCompositeGlyphs.h +++ b/RenderCompositeGlyphs.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCompositeGlyphsCompat.cpp b/RenderCompositeGlyphsCompat.cpp index 3fe10fa..d620209 100644 --- a/RenderCompositeGlyphsCompat.cpp +++ b/RenderCompositeGlyphsCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCompositeGlyphsCompat.h b/RenderCompositeGlyphsCompat.h index 7a00608..59e207c 100644 --- a/RenderCompositeGlyphsCompat.h +++ b/RenderCompositeGlyphsCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreateGlyphSet.cpp b/RenderCreateGlyphSet.cpp index b9da8d7..2deb81f 100644 --- a/RenderCreateGlyphSet.cpp +++ b/RenderCreateGlyphSet.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreateGlyphSet.h b/RenderCreateGlyphSet.h index 0f14ce0..673db18 100644 --- a/RenderCreateGlyphSet.h +++ b/RenderCreateGlyphSet.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreateGlyphSetCompat.cpp b/RenderCreateGlyphSetCompat.cpp index 49e9f74..0240d3f 100644 --- a/RenderCreateGlyphSetCompat.cpp +++ b/RenderCreateGlyphSetCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreateGlyphSetCompat.h b/RenderCreateGlyphSetCompat.h index 174313e..604d2a5 100644 --- a/RenderCreateGlyphSetCompat.h +++ b/RenderCreateGlyphSetCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreatePicture.cpp b/RenderCreatePicture.cpp index cb3d565..83a9855 100644 --- a/RenderCreatePicture.cpp +++ b/RenderCreatePicture.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreatePicture.h b/RenderCreatePicture.h index 35de9b8..b665f82 100644 --- a/RenderCreatePicture.h +++ b/RenderCreatePicture.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreatePictureCompat.cpp b/RenderCreatePictureCompat.cpp index fa4dcb4..7deccba 100644 --- a/RenderCreatePictureCompat.cpp +++ b/RenderCreatePictureCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderCreatePictureCompat.h b/RenderCreatePictureCompat.h index 15c8c85..7610aa8 100644 --- a/RenderCreatePictureCompat.h +++ b/RenderCreatePictureCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderExtension.cpp b/RenderExtension.cpp index 79c26e6..ce895fc 100644 --- a/RenderExtension.cpp +++ b/RenderExtension.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderExtension.h b/RenderExtension.h index 275ef1c..72f5b36 100644 --- a/RenderExtension.h +++ b/RenderExtension.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFillRectangles.cpp b/RenderFillRectangles.cpp index 6f08d97..ee8e13c 100644 --- a/RenderFillRectangles.cpp +++ b/RenderFillRectangles.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFillRectangles.h b/RenderFillRectangles.h index 1898559..de54729 100644 --- a/RenderFillRectangles.h +++ b/RenderFillRectangles.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFreeGlyphSet.cpp b/RenderFreeGlyphSet.cpp index 50010e3..384ac7b 100644 --- a/RenderFreeGlyphSet.cpp +++ b/RenderFreeGlyphSet.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFreeGlyphSet.h b/RenderFreeGlyphSet.h index 7233031..cadf623 100644 --- a/RenderFreeGlyphSet.h +++ b/RenderFreeGlyphSet.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFreePicture.cpp b/RenderFreePicture.cpp index b1074f3..38f3600 100644 --- a/RenderFreePicture.cpp +++ b/RenderFreePicture.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFreePicture.h b/RenderFreePicture.h index 2329cb4..2eab943 100644 --- a/RenderFreePicture.h +++ b/RenderFreePicture.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFreePictureCompat.cpp b/RenderFreePictureCompat.cpp index fb4c7ac..f84ab6a 100644 --- a/RenderFreePictureCompat.cpp +++ b/RenderFreePictureCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderFreePictureCompat.h b/RenderFreePictureCompat.h index 32d613a..c8ecee8 100644 --- a/RenderFreePictureCompat.h +++ b/RenderFreePictureCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderGenericRequest.cpp b/RenderGenericRequest.cpp index 4f979c1..7cd1b94 100644 --- a/RenderGenericRequest.cpp +++ b/RenderGenericRequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderGenericRequest.h b/RenderGenericRequest.h index 8fa3acb..c037e16 100644 --- a/RenderGenericRequest.h +++ b/RenderGenericRequest.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderMinorExtensionHeaders.h b/RenderMinorExtensionHeaders.h index dda0042..d5174d6 100644 --- a/RenderMinorExtensionHeaders.h +++ b/RenderMinorExtensionHeaders.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderMinorExtensionMethods.h b/RenderMinorExtensionMethods.h index 397f696..c6803ee 100644 --- a/RenderMinorExtensionMethods.h +++ b/RenderMinorExtensionMethods.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderMinorExtensionTags.h b/RenderMinorExtensionTags.h index 1d61b10..cfd377c 100644 --- a/RenderMinorExtensionTags.h +++ b/RenderMinorExtensionTags.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureClip.cpp b/RenderPictureClip.cpp index 7428e72..6f90975 100644 --- a/RenderPictureClip.cpp +++ b/RenderPictureClip.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureClip.h b/RenderPictureClip.h index 35b320c..4656467 100644 --- a/RenderPictureClip.h +++ b/RenderPictureClip.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureClipCompat.cpp b/RenderPictureClipCompat.cpp index 67d8730..f73a6ac 100644 --- a/RenderPictureClipCompat.cpp +++ b/RenderPictureClipCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureClipCompat.h b/RenderPictureClipCompat.h index 05fc5cd..a69d7ae 100644 --- a/RenderPictureClipCompat.h +++ b/RenderPictureClipCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureFilter.cpp b/RenderPictureFilter.cpp index b48fdca..c626457 100644 --- a/RenderPictureFilter.cpp +++ b/RenderPictureFilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureFilter.h b/RenderPictureFilter.h index cf6ad54..df7c448 100644 --- a/RenderPictureFilter.h +++ b/RenderPictureFilter.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureTransform.cpp b/RenderPictureTransform.cpp index 048b73e..fc99fab 100644 --- a/RenderPictureTransform.cpp +++ b/RenderPictureTransform.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderPictureTransform.h b/RenderPictureTransform.h index 061b6a3..948774c 100644 --- a/RenderPictureTransform.h +++ b/RenderPictureTransform.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderTrapezoids.cpp b/RenderTrapezoids.cpp index 32fcd01..962f6f5 100644 --- a/RenderTrapezoids.cpp +++ b/RenderTrapezoids.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderTrapezoids.h b/RenderTrapezoids.h index 3f32020..4e4a179 100644 --- a/RenderTrapezoids.h +++ b/RenderTrapezoids.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderTriangles.cpp b/RenderTriangles.cpp index e98bf35..aba6d4c 100644 --- a/RenderTriangles.cpp +++ b/RenderTriangles.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/RenderTriangles.h b/RenderTriangles.h index 6c4d105..b2e616e 100644 --- a/RenderTriangles.h +++ b/RenderTriangles.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rgb.cpp b/Rgb.cpp index ad2e2fd..3216ced 100644 --- a/Rgb.cpp +++ b/Rgb.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rgb.h b/Rgb.h index 98ead38..2454ed5 100644 --- a/Rgb.h +++ b/Rgb.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rle.cpp b/Rle.cpp index b7b1460..ed720b6 100644 --- a/Rle.cpp +++ b/Rle.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Rle.h b/Rle.h index 0e39fae..bade216 100644 --- a/Rle.h +++ b/Rle.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SendEvent.cpp b/SendEvent.cpp index f65b1db..09aad1b 100644 --- a/SendEvent.cpp +++ b/SendEvent.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SendEvent.h b/SendEvent.h index 9426180..3d68570 100644 --- a/SendEvent.h +++ b/SendEvent.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SequenceQueue.cpp b/SequenceQueue.cpp index ce044b1..e4be3a0 100644 --- a/SequenceQueue.cpp +++ b/SequenceQueue.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SequenceQueue.h b/SequenceQueue.h index b243c4c..684d8f1 100644 --- a/SequenceQueue.h +++ b/SequenceQueue.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerCache.cpp b/ServerCache.cpp index f0cc6f8..4616a82 100644 --- a/ServerCache.cpp +++ b/ServerCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerCache.h b/ServerCache.h index ec213b8..cbe3f82 100644 --- a/ServerCache.h +++ b/ServerCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerChannel.cpp b/ServerChannel.cpp index 4e6dea3..155d634 100644 --- a/ServerChannel.cpp +++ b/ServerChannel.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerChannel.h b/ServerChannel.h index 6536db8..23a46b8 100644 --- a/ServerChannel.h +++ b/ServerChannel.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerProxy.cpp b/ServerProxy.cpp index 404dd51..0a72fc3 100644 --- a/ServerProxy.cpp +++ b/ServerProxy.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerProxy.h b/ServerProxy.h index 8c4a884..a012172 100644 --- a/ServerProxy.h +++ b/ServerProxy.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerReadBuffer.cpp b/ServerReadBuffer.cpp index 53c1dec..0afd074 100644 --- a/ServerReadBuffer.cpp +++ b/ServerReadBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerReadBuffer.h b/ServerReadBuffer.h index 438e2f0..5e44f67 100644 --- a/ServerReadBuffer.h +++ b/ServerReadBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerStore.cpp b/ServerStore.cpp index b0e13b1..9b8ba8d 100644 --- a/ServerStore.cpp +++ b/ServerStore.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ServerStore.h b/ServerStore.h index 8df1f1e..7fa325d 100644 --- a/ServerStore.h +++ b/ServerStore.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetClipRectangles.cpp b/SetClipRectangles.cpp index 8774744..c2c90d9 100644 --- a/SetClipRectangles.cpp +++ b/SetClipRectangles.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetClipRectangles.h b/SetClipRectangles.h index 06b4421..b2cfff8 100644 --- a/SetClipRectangles.h +++ b/SetClipRectangles.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackAlpha.cpp b/SetUnpackAlpha.cpp index a0dd1fc..163b51a 100644 --- a/SetUnpackAlpha.cpp +++ b/SetUnpackAlpha.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackAlpha.h b/SetUnpackAlpha.h index 2e32a65..a82bab6 100644 --- a/SetUnpackAlpha.h +++ b/SetUnpackAlpha.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackAlphaCompat.cpp b/SetUnpackAlphaCompat.cpp index a8fcabd..72f1a29 100644 --- a/SetUnpackAlphaCompat.cpp +++ b/SetUnpackAlphaCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackAlphaCompat.h b/SetUnpackAlphaCompat.h index 80d1522..db0c7c9 100644 --- a/SetUnpackAlphaCompat.h +++ b/SetUnpackAlphaCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackColormap.cpp b/SetUnpackColormap.cpp index d522d32..66bf8c2 100644 --- a/SetUnpackColormap.cpp +++ b/SetUnpackColormap.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackColormap.h b/SetUnpackColormap.h index 53277b3..95dfd0b 100644 --- a/SetUnpackColormap.h +++ b/SetUnpackColormap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackColormapCompat.cpp b/SetUnpackColormapCompat.cpp index 65b108a..4405b2b 100644 --- a/SetUnpackColormapCompat.cpp +++ b/SetUnpackColormapCompat.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackColormapCompat.h b/SetUnpackColormapCompat.h index d1ffad8..8a87f62 100644 --- a/SetUnpackColormapCompat.h +++ b/SetUnpackColormapCompat.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackGeometry.cpp b/SetUnpackGeometry.cpp index 67b79a4..8af69d0 100644 --- a/SetUnpackGeometry.cpp +++ b/SetUnpackGeometry.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/SetUnpackGeometry.h b/SetUnpackGeometry.h index 3a8224d..94e8b67 100644 --- a/SetUnpackGeometry.h +++ b/SetUnpackGeometry.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ShapeExtension.cpp b/ShapeExtension.cpp index daa19fb..a5311e6 100644 --- a/ShapeExtension.cpp +++ b/ShapeExtension.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/ShapeExtension.h b/ShapeExtension.h index 32c3b55..33bd832 100644 --- a/ShapeExtension.h +++ b/ShapeExtension.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Socket.cpp b/Socket.cpp index ea00a9b..77fa2e5 100644 --- a/Socket.cpp +++ b/Socket.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Socket.h b/Socket.h index 27c3308..9a0e6b3 100644 --- a/Socket.h +++ b/Socket.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Split.cpp b/Split.cpp index 50627e7..8951a77 100644 --- a/Split.cpp +++ b/Split.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Split.h b/Split.h index c9a3c9a..15453cb 100644 --- a/Split.h +++ b/Split.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/StaticCompressor.cpp b/StaticCompressor.cpp index b30e61a..d9d3ec1 100644 --- a/StaticCompressor.cpp +++ b/StaticCompressor.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/StaticCompressor.h b/StaticCompressor.h index 3e5b25c..0fde101 100644 --- a/StaticCompressor.h +++ b/StaticCompressor.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Statistics.cpp b/Statistics.cpp index 294518f..750654b 100644 --- a/Statistics.cpp +++ b/Statistics.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Statistics.h b/Statistics.h index 44ff883..f7740b7 100644 --- a/Statistics.h +++ b/Statistics.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/TextCompressor.cpp b/TextCompressor.cpp index 1613122..90ec49a 100644 --- a/TextCompressor.cpp +++ b/TextCompressor.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/TextCompressor.h b/TextCompressor.h index b373b98..1879bd4 100644 --- a/TextCompressor.h +++ b/TextCompressor.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Timestamp.cpp b/Timestamp.cpp index 295eb65..9d5618b 100644 --- a/Timestamp.cpp +++ b/Timestamp.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Timestamp.h b/Timestamp.h index 6995398..5e6ddc4 100644 --- a/Timestamp.h +++ b/Timestamp.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/TranslateCoords.cpp b/TranslateCoords.cpp index e67e1da..4da71f8 100644 --- a/TranslateCoords.cpp +++ b/TranslateCoords.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/TranslateCoords.h b/TranslateCoords.h index 3f21b24..09999a8 100644 --- a/TranslateCoords.h +++ b/TranslateCoords.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Transport.cpp b/Transport.cpp index 4b49678..9a384b9 100644 --- a/Transport.cpp +++ b/Transport.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Transport.h b/Transport.h index 2f313b2..42989a6 100644 --- a/Transport.h +++ b/Transport.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Types.h b/Types.h index 05f62bd..6a02f17 100644 --- a/Types.h +++ b/Types.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Unpack.cpp b/Unpack.cpp index 5fc4944..ecf8974 100644 --- a/Unpack.cpp +++ b/Unpack.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Unpack.h b/Unpack.h index 65a410f..6051009 100644 --- a/Unpack.h +++ b/Unpack.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Utils.cpp b/Utils.cpp index a282078..5b16b10 100644 --- a/Utils.cpp +++ b/Utils.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/VERSION b/VERSION index ffc9bea..1545d96 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.0.8 +3.5.0 diff --git a/Vars.c b/Vars.c index 0d93a6d..0f5353b 100644 --- a/Vars.c +++ b/Vars.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/WriteBuffer.cpp b/WriteBuffer.cpp index ac38fe6..de6c828 100644 --- a/WriteBuffer.cpp +++ b/WriteBuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/WriteBuffer.h b/WriteBuffer.h index 4673cec..0adb442 100644 --- a/WriteBuffer.h +++ b/WriteBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/XidCache.cpp b/XidCache.cpp index a9a723c..4385c38 100644 --- a/XidCache.cpp +++ b/XidCache.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/XidCache.h b/XidCache.h index 78a94d8..a3deed6 100644 --- a/XidCache.h +++ b/XidCache.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Z.cpp b/Z.cpp index e6c93cd..3953b89 100644 --- a/Z.cpp +++ b/Z.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Z.h b/Z.h index d7f7fa1..4df1418 100644 --- a/Z.h +++ b/Z.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/debian/changelog b/debian/changelog index 1aa52c3..bdaacc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nxcomp (3.5.0-1-0~x2go2) unstable; urgency=low + + * New upstream version + + -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:41:10 +0200 + nxcomp (3.4.0.8-0~x2go1) unstable; urgency=low * New upstream version: hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library).

1 0

buildscripts.git - master (branch) updated: e4a28490a4ffaec45afeb6c9db9f16e2cd7ec008
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via e4a28490a4ffaec45afeb6c9db9f16e2cd7ec008 (commit) from 8452813bc06c9238b0de33899e5862f75c0ea8ad (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 e4a28490a4ffaec45afeb6c9db9f16e2cd7ec008 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 13:54:47 2011 +0200 Create arch PKGDIST dirs for EXTRA_ARCHS ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index 2464ef9..cbf3411 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -74,7 +74,7 @@ clear_pkgdist() { for l_CODENAME in $CODENAMES; do if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then for l_ARCH in amd64 i386; do - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build @@ -84,7 +84,7 @@ clear_pkgdist() { done fi for l_EXTRA_ARCH in $EXTRA_ARCHS; do - mkdir -p $PKGDIST/$l_DIST/$l_CODENAME + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.changes rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.upload rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.build @@ -103,6 +103,7 @@ prepare_workspace() { rm -f $PROJECT_DIR/BUILDS_FOR # make sure our local working copy is up to date... + if [ -d $PROJECT_DIR/.git ]; then cd $PROJECT_DIR && git reset --hard git pull origin $CHECKOUT @@ -162,6 +163,7 @@ build_packages() { } } for extra_arch in $EXTRA_ARCHS; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch } @@ -177,6 +179,7 @@ build_packages() { } } for extra_arch in $EXTRA_ARCHS; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch } hooks/post-receive -- buildscripts.git (buildscripts upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (buildscripts upstream project).

1 0

buildscripts.git - master (branch) updated: 8452813bc06c9238b0de33899e5862f75c0ea8ad
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via 8452813bc06c9238b0de33899e5862f75c0ea8ad (commit) via ef4681956793224908eb328a864056470b0bf54b (commit) from 2fbd79666c4ba1595fc457d9f7f99286c8df9ddb (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 8452813bc06c9238b0de33899e5862f75c0ea8ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 13:50:28 2011 +0200 complete build script for EXTRA_ARCHS like armel commit ef4681956793224908eb328a864056470b0bf54b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 13:49:42 2011 +0200 use kernel without initrd for armel arch ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 46 ++++++++++++++++++++++++++++++++-------------- home/.pbuilderrc | 3 ++- 2 files changed, 34 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index 00c5151..2464ef9 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -53,8 +53,8 @@ set_vars() { PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT" # build for other architectures than amd64/i386 - EXTRA_ARCHS="${EXTRA_ARCHS:-''}" - EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-''}" + EXTRA_ARCHS="${EXTRA_ARCHS:-}" + EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}" # creating paths mkdir -p "$TEMP_BASE" @@ -72,15 +72,26 @@ clear_pkgdist() { CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { for l_CODENAME in $CODENAMES; do - for l_ARCH in amd64 i386; do + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then + for l_ARCH in amd64 i386; do + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb + done + fi + for l_EXTRA_ARCH in $EXTRA_ARCHS; do mkdir -p $PKGDIST/$l_DIST/$l_CODENAME - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.changes - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.upload - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.build - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.dsc - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_*.tar.gz - rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/*.deb - done + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.changes + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.upload + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.build + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.dsc + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_*.tar.gz + rm -f $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/*.deb + done done } done @@ -142,7 +153,7 @@ build_packages() { mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386} OTHERMIRROR="deb http://packages.x2go.org/debian $l_CODENAME $COMPONENT" [ "x$USE_SUDO" != "xyes" ] && { - test -n $EXTRA_ARCHS_ONLY && { + [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 } @@ -157,7 +168,7 @@ build_packages() { done } [ "x$USE_SUDO" = "xyes" ] && { - test -n $EXTRA_ARCHS_ONLY && { + [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 } @@ -188,8 +199,15 @@ upload_packages() { l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} for l_CODENAME in $CODENAMES; do - for l_ARCH in amd64 i386; do - cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH + if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then + for l_ARCH in amd64 i386; do + cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH + ls $PROJECT_*.changes &>/dev/null && dupload --to x2go-$l_DIST-$l_CODENAME $PROJECT_*.changes + cd - + done + fi + for l_EXTRA_ARCH in $EXTRA_ARCHS; do + cd $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH ls $PROJECT_*.changes &>/dev/null && dupload --to x2go-$l_DIST-$l_CODENAME $PROJECT_*.changes cd - done diff --git a/home/.pbuilderrc b/home/.pbuilderrc index e817471..74992ea 100644 --- a/home/.pbuilderrc +++ b/home/.pbuilderrc @@ -31,12 +31,13 @@ UML_DISTRIBUTION="$CODENAME" # qemubuilder options BASEPATH="$BASEDIRECTORY/base-$DIST-$CODENAME-$ARCH.qemu" KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz -INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img ARCH_DISKDEVICE=sd if [ "x$ARCH" = "xarmel" ]; then MEMORY_MEGS=256 + INITRD="" else MEMORY_MEGS=512 + INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img fi if [ "x${DIST}" = "xubuntu" ]; then hooks/post-receive -- buildscripts.git (buildscripts upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (buildscripts upstream project).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits