x2go-commits January 2012

x2go-commits@lists.x2go.org

1 participants
126 discussions

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

18 Jan '12

The branch, master has been updated via 67d66c597240cd2a88c29142556acc4baada0f6e (commit) from d578560869faad7bc5e1c7be02d07ac7f725d6be (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 67d66c597240cd2a88c29142556acc4baada0f6e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:45:07 2012 +0100 Version increment, continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d8935dd..aec1bf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.0.99.10): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:43:21 +0100 + x2goserver (3.0.99.9-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index c7d6552..026a698 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.9 \ No newline at end of file +3.0.99.10 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index c7d6552..026a698 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.9 \ No newline at end of file +3.0.99.10 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index c7d6552..026a698 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.9 \ No newline at end of file +3.0.99.10 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index c7d6552..026a698 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.0.99.9 \ No newline at end of file +3.0.99.10 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index c7d6552..026a698 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.0.99.9 \ No newline at end of file +3.0.99.10 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index c7d6552..026a698 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.0.99.9 \ No newline at end of file +3.0.99.10 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

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

18 Jan '12

The branch, build-main has been updated via d578560869faad7bc5e1c7be02d07ac7f725d6be (commit) via 9a2cf4f7db806415601c90866bbde1acd3fd5001 (commit) via 21939b511d26b0bb737fa41c2219e11ce993c842 (commit) via 45b1367dfa77432852ce741eb9052f83b242a75c (commit) via 2e398b9c0964748f404b7ad4140d7ae229e98612 (commit) via 5ea9eaad648e916e182ee0c3a56c3c49c97ce80f (commit) via 59a492c2d3632c68c543da036a742f624431cdcb (commit) via 3c0cb17f554b7614016018222b56a445104e8355 (commit) via 9029807eca96120440e57e7a5cf0fc7cab0d3841 (commit) via 93fa35b38ff5d2b9a67c6db1475b5422a15b5769 (commit) via c0b97603f18c6d5555384c47cb88c18ba9bf660b (commit) via e9cf74ecc5138a053ecc0bd1e078aa1208c11a3a (commit) via 92525697feca404e86cf6bc2155515c37ed43299 (commit) via b8303b69146ea5c027f7dbd549c8ea708f790783 (commit) via 2f7093934874c7ea5c02258efba24654ba855edb (commit) via 50cf94a3d3f9eb433764448b4c1235c7d520db82 (commit) via 1a21a3f9871e698ec0938c1501cae23ad783ed3b (commit) via 6068dec71041582d95e8ae322b1a5601369856d8 (commit) via 3df68647e449f439ed33dd3b201f43e6051ab28a (commit) via 1dc52c5c458d2e3d35151a68363b4b825c1f7dfe (commit) via 197765426bc6832460670baf9aff45e101458957 (commit) via cdc1a1f3713ccd23d7ca35d3263a53ed8372844c (commit) via 123bd195c9288a5606bd1b4f807bbdc5651e907f (commit) via 0ddcb23f0faddfecec4c16bcc67ee7fddf2d1772 (commit) via 202213dfd8d860923fd3560cbb59ae99a21a61e3 (commit) via 52e277550101af3b80dc306ede67a5a9b94937ff (commit) via 8084d7edbc6a7efaf38debe468a1a7a25fd6d1eb (commit) via f21aa45a5759d2d167050e069a829e615ceb865d (commit) via 42323861f27f8ffd215009765e61b1312707a58c (commit) via c0fea2a62ddf6b0186305858853f927a4dff252a (commit) via 39d5ce818f845fe1f613a5efef1311bd33eee520 (commit) via e313dbe0d454ac23db65c8955bc85dc97fd9d960 (commit) via 8baeee936bcb2517a744c25e1d6c629750493efc (commit) via 22b6adf2729f67c8cc4c1f995e1d177fcb12d469 (commit) via bf3d7a5a35acdf42206e6b723ec90222e1cb70f6 (commit) via 97506f8090c0fcb0bd641a368029342f5e1e4b9e (commit) via d162a4c5ccf895e9136c930e1ce17cb860a8def7 (commit) via 79f81a4013f1ef1eda8ad12632f12bbd53eefa4d (commit) via 4e014885ad2dbbabb680f71d5353ee0f1b66d09a (commit) via 1e5b8ed6fc775d533f4781656a2c2c80be6624a1 (commit) via 3692ac5dd4771df1753012c3199cc97fabd1d694 (commit) via 31b58ab1c99513bf1ded60a213210cac0182615f (commit) via 905e1c5326ff61f9ce8bb4cb486e34adebe545df (commit) via 1f3c8dafa7f052840e45385ca07897b3d98cde72 (commit) via 52abfd0b36832e1b80a51ee27fbecfa1cacb2387 (commit) via cb7f54e232fc66a16cc4434cc75caa3166a2d5d3 (commit) via 69eca656c070b2519f7aa3aef9c25c5ece882b12 (commit) from df472e95f6b39498d50db8fff849bd93beff05c1 (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 | 4 +- Makefile | 6 +++ debian/changelog | 30 +++++++++++++ debian/control | 28 +++++++++++- debian/x2goserver-printing.postinst | 2 +- ...rver-extensions.dirs => x2goserver-pyhoca.dirs} | 0 debian/x2goserver-pyhoca.docs | 1 + debian/x2goserver-pyhoca.install | 3 + debian/x2goserver-pyhoca.manpages | 1 + x2goserver-compat/VERSION.x2goserver-compat | 2 +- x2goserver-extensions/Makefile | 24 +++++----- .../VERSION.x2goserver-extensions | 2 +- .../x2gofeature.d/x2goserver-extensions.features | 1 - x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-printing/bin/x2goprint | 2 +- .../Makefile | 9 ++-- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 1 + .../bin/x2gosetkeyboard | 0 .../man/man8/x2gosetkeyboard.8 | 0 .../share/x2gofeature.d/x2goserver-pyhoca.features | 2 +- x2goserver-xsession/Makefile | 11 ++++- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/Makefile | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2gobasepath | 7 ++- x2goserver/{lib => bin}/x2gogetservers | 0 x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2goresume-session | 6 +++ x2goserver/bin/x2goruncommand | 7 +++ x2goserver/bin/x2gostartagent | 46 ++++++++++++------- x2goserver/sbin/x2godbadmin | 12 ++++- 31 files changed, 162 insertions(+), 55 deletions(-) copy debian/{x2goserver-extensions.dirs => x2goserver-pyhoca.dirs} (100%) create mode 100644 debian/x2goserver-pyhoca.docs create mode 100644 debian/x2goserver-pyhoca.install create mode 100644 debian/x2goserver-pyhoca.manpages copy {x2goserver-printing => x2goserver-pyhoca}/Makefile (90%) create mode 100644 x2goserver-pyhoca/VERSION.x2goserver-pyhoca rename {x2goserver-extensions => x2goserver-pyhoca}/bin/x2gosetkeyboard (100%) rename {x2goserver-extensions => x2goserver-pyhoca}/man/man8/x2gosetkeyboard.8 (100%) copy x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features => x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features (96%) rename x2goserver/{lib => bin}/x2gogetservers (100%) The diff of changes is: diff --git a/INSTALL b/INSTALL index 15a0dfb..eeac765 100644 --- a/INSTALL +++ b/INSTALL @@ -19,11 +19,11 @@ already: $ chown x2goprint:x2goprint ~x2goprint $ chmod 0770 ~x2goprint -2.) INSTALL x2goserver FILES +2.) BUILD + INSTALL x2goserver FILES ----------------------------- Extract tarball and run - $ make install + $ make && make install in base folder of the extracted tarball. diff --git a/Makefile b/Makefile index 657dcfc..e7efc9f 100755 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ build_man2html: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ clean: cd x2goserver && make $@ @@ -18,6 +19,7 @@ clean: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ build-arch: cd x2goserver && make $@ @@ -25,6 +27,7 @@ build-arch: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ build-indep: cd x2goserver && make $@ @@ -32,6 +35,7 @@ build-indep: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ install: cd x2goserver && make $@ @@ -39,6 +43,7 @@ install: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ uninstall: cd x2goserver-extensions && make $@ @@ -46,5 +51,6 @@ uninstall: cd x2goserver-printing && make $@ cd x2goserver && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ diff --git a/debian/changelog b/debian/changelog index d4926ac..d8935dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +x2goserver (3.0.99.9-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.0.99.9): + - Fix for install stanzas in several Makefiles. + - Give X2Go session windows a human readable title. + - Desktop sharing: fix username of user who requests desktop sharing. + - Fix x2gobasepath for Perl versions < 5.10.x. + - Fix x2godbadmin for Perl versions < 5.10.x. + - Remove x2gosetkeyboard from x2goserver-extensions package. + - Re-add x2gosetkeyboard via new subproject x2goserver-pyhoca. + - Call x2golistmounts with user privileges instead of using db_getmounts + in x2goprint script. + - Avoid potentially empty LD_LIBRARY_PATH path in x2goruncommand. + - Install x2gogetservers to $PREFIX/bin instead of $PREFIX/lib/x2go. + * Add psmisc package as dependency. + * Add new binary package to x2goserver source: x2goserver-pyhoca. + * x2goserver package suggests x2goserver-pyhoca. + * Fix directory permissions of $HOME directory of x2goprint system user. + + [ Hayawardh Vijayakumar ] + * New upstream version (3.0.99.9): + - Fix potentially empty LD_LIBRARY_PATH in x2gostartagent. + + [ Oleksandr Shneyder ] + * New upstream version (3.0.99.9): + - Add Xinerama support. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:39:57 +0100 + x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low * New upstream version (3.0.99.8): diff --git a/debian/control b/debian/control index 8be5cdc..89dc5b2 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,8 @@ Depends: libdbd-pg-perl, libdbd-sqlite3-perl, adduser, - xauth + xauth, + psmisc Recommends: sshfs, x11-apps, @@ -40,7 +41,8 @@ Recommends: Suggests: x2goserver-printing (= ${source:Version}), x2goserver-compat (= ${source:Version}), - x2goserver-xsession (= ${source:Version}) + x2goserver-xsession (= ${source:Version}), + x2goserver-pyhoca (= ${source:Version}) Breaks: x2goserver-one, x2goserver-home, @@ -164,3 +166,25 @@ Description: X2go server daemon scripts (Xsession runner) startups and many more Xsession related features on X2go session login automagically. +Package: x2goserver-pyhoca +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), +Description: X2go server daemon scripts (add-ons for pyhoca client) + X2go is a server based computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This X2go server add-on adds extra functionality when using + the pyhoca client (GUI or cmdline tool). The installation + of this package is completely optional, the pyhoca client + will work without. + . + Functionalities this package adds: + - renaming of session window titles + - setting detailled X keyboard parameters diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst index 8ad8f80..7c1451c 100755 --- a/debian/x2goserver-printing.postinst +++ b/debian/x2goserver-printing.postinst @@ -57,7 +57,7 @@ case "$1" in # make sure x2goprint spool dir permissions are set correctly chown -R x2goprint:x2goprint /var/spool/x2goprint # egid x2goprint needs write access to the spool dir - chmod 0770 /var/spool/x2goprint + chmod 0700 /var/spool/x2goprint # we may be upgrading versions of x2goserver that had # /usr/bin/x2goprint set to setuid x2goprint. diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-pyhoca.dirs similarity index 100% copy from debian/x2goserver-extensions.dirs copy to debian/x2goserver-pyhoca.dirs diff --git a/debian/x2goserver-pyhoca.docs b/debian/x2goserver-pyhoca.docs new file mode 100644 index 0000000..6652b35 --- /dev/null +++ b/debian/x2goserver-pyhoca.docs @@ -0,0 +1 @@ +x2goserver-pyhoca/.build_man2html/html diff --git a/debian/x2goserver-pyhoca.install b/debian/x2goserver-pyhoca.install new file mode 100644 index 0000000..7ba0b60 --- /dev/null +++ b/debian/x2goserver-pyhoca.install @@ -0,0 +1,3 @@ +x2goserver-pyhoca/bin/x2go* /usr/bin/ +x2goserver-pyhoca/VERSION.x2goserver-pyhoca /usr/share/x2go/versions/ +x2goserver-pyhoca/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver-pyhoca.manpages b/debian/x2goserver-pyhoca.manpages new file mode 100644 index 0000000..845a36c --- /dev/null +++ b/debian/x2goserver-pyhoca.manpages @@ -0,0 +1 @@ +x2goserver-pyhoca/man/man8/* \ No newline at end of file diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index d720f99..c7d6552 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 2ecf49a..02a9525 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -71,18 +71,18 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ # $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ - $(INSTALL_FILE) lib/extensions/pre-start.d/* $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ - $(INSTALL_FILE) lib/extensions/post-start.d/* $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ - $(INSTALL_FILE) lib/extensions/fail-start.d/* $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ - $(INSTALL_FILE) lib/extensions/pre-resume.d/* $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/ - $(INSTALL_FILE) lib/extensions/post-resume.d/* $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/ - $(INSTALL_FILE) lib/extensions/post-fail.d/* $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/ - $(INSTALL_FILE) lib/extensions/pre-suspend.d/* $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/ - $(INSTALL_FILE) lib/extensions/post-suspend.d/* $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/ - $(INSTALL_FILE) lib/extensions/fail-suspend.d/* $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/ - $(INSTALL_FILE) lib/extensions/pre-terminate.d/* $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/ - $(INSTALL_FILE) lib/extensions/post-terminate.d/* $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/ - $(INSTALL_FILE) lib/extensions/fail-terminate.d/* $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/ + $(INSTALL_FILE) lib/extensions/pre-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ + $(INSTALL_FILE) lib/extensions/post-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ + $(INSTALL_FILE) lib/extensions/fail-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ + $(INSTALL_FILE) lib/extensions/pre-resume.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/ + $(INSTALL_FILE) lib/extensions/post-resume.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/ + $(INSTALL_FILE) lib/extensions/fail-resume.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/ + $(INSTALL_FILE) lib/extensions/pre-suspend.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/ + $(INSTALL_FILE) lib/extensions/post-suspend.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/ + $(INSTALL_FILE) lib/extensions/fail-suspend.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/ + $(INSTALL_FILE) lib/extensions/pre-terminate.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/ + $(INSTALL_FILE) lib/extensions/post-terminate.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/ + $(INSTALL_FILE) lib/extensions/fail-terminate.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index d720f99..c7d6552 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 7e50dd7..509e5a4 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -29,7 +29,6 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; "X2GO_RUN_EXTENSIONS") echo "ok"; exit 0;; *) exit -1;; diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index d720f99..c7d6552 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index fa3e4ae..480c583 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -100,7 +100,7 @@ chown $uid, $gid, "$spooltmp"; chmod 0700, "$spooltmp"; # this last part mainly uses the session user's privileges -my ($mounts)=db_getmounts($session); +my $mounts=`su $user -c "x2golistmounts $session"`; if ( $mounts=~m/$spooldir/) { diff --git a/x2goserver-printing/Makefile b/x2goserver-pyhoca/Makefile similarity index 90% copy from x2goserver-printing/Makefile copy to x2goserver-pyhoca/Makefile index 04f93bf..aa6a562 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -15,7 +15,7 @@ PREFIX=/usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin -#LIBDIR=$(PREFIX)/lib/x2go +LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go @@ -53,11 +53,10 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) # $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) -# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ # $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ -# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: @@ -76,7 +75,7 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-printing $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing + $(INSTALL_FILE) VERSION.x2goserver-pyhoca $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version @@ -99,5 +98,5 @@ uninstall_man: $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca new file mode 100644 index 0000000..c7d6552 --- /dev/null +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -0,0 +1 @@ +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard similarity index 100% rename from x2goserver-extensions/bin/x2gosetkeyboard rename to x2goserver-pyhoca/bin/x2gosetkeyboard diff --git a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 similarity index 100% rename from x2goserver-extensions/man/man8/x2gosetkeyboard.8 rename to x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features similarity index 96% copy from x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features copy to x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features index 9fb329e..eb0dce4 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features @@ -29,7 +29,7 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_XSESSION") echo "ok"; exit 0;; + "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; *) exit -1;; esac diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ec4a063..2bbbd66 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -5,6 +5,7 @@ SHELL=/bin/bash INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 +INSTALL_SYMLINK=ln -s -f INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f @@ -62,7 +63,15 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_FILE) etc/* $(DESTDIR)$(ETCDIR)/ +# provide target dirs for X11 related symlinks + mkdir -p /etc/X11/Xresources + mkdir -p /etc/X11/Xsession.d + touch /etc/X11/Xsession.options + $(INSTALL_FILE) etc/Xsession $(DESTDIR)$(ETCDIR)/ + $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ + $(INSTALL_SYMLINK) /etc/X11/Xsession.d $(DESTDIR)$(ETCDIR)/ + $(INSTALL_SYMLINK) /etc/X11/Xsession.options $(DESTDIR)$(ETCDIR)/ + install_man: # $(INSTALL_DIR) $(DESTDIR)$(MANDIR) diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index d720f99..c7d6552 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 2cc1bbd..d934497 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -67,7 +67,7 @@ install_scripts: $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ chmod a-x $(DESTDIR)$(LIBDIR)/*.pm - chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper + getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper || true chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper install_config: diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index d720f99..c7d6552 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver/bin/x2gobasepath b/x2goserver/bin/x2gobasepath index 4f9198b..1716538 100755 --- a/x2goserver/bin/x2gobasepath +++ b/x2goserver/bin/x2gobasepath @@ -21,9 +21,10 @@ use strict; use Cwd; -use Cwd 'abs_path'; +use Cwd q{abs_path}; +use File::Basename; -my $dir = getcwd; -my $base_path = abs_path("$0/../.."); +my $dir = dirname($0); +my $base_path = abs_path("$dir/.."); print "$base_path"; diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/bin/x2gogetservers similarity index 100% rename from x2goserver/lib/x2gogetservers rename to x2goserver/bin/x2gogetservers diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 7f65d07..203eb06 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -31,7 +31,7 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); -syslog('info', "x2golistmountdirs has been called with options: @ARGV"); +syslog('info', "x2gomountdirs has been called with options: @ARGV"); my $type=shift; my $session=shift; diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 16a7f0c..7ad09f4 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -35,6 +35,12 @@ X2GO_ROOT=${HOME}/.x2go X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +NX_XINERAMA_CONF=$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf +if [ -e $NX_XINERAMA_CONF ] +then + rm $NX_XINERAMA_CONF +fi + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" if [ "$X2GO_GEOMETRY" == "" ] diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index d3f0d98..b24d2f2 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -40,8 +40,15 @@ X2GO_ROOT=${HOME}/.x2go MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput echo "exec $cmd" >> $MESSAGE_FILE +NX_XINERAMA_CONF=$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf +export NX_XINERAMA_CONF + IMEXIT="false" +NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama +test -n $LD_LIBRARY_PATH && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH=$NX_XINERAMA_LIBS +export LD_LIBRARY_PATH + if [ "$sndsys" == "esd" ]; then export ESPEAKER=localhost:$4 elif [ "$sndsys" == "arts" ]; then diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 32d16b8..2af8749 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -29,16 +29,19 @@ SSH_PORT=30000 #First ssh port 30001 X2GO_ROOT=${HOME}/.x2go REMOTE=localhost + X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` -X2GO_GEOMETRY=$1 -X2GO_LINK=$2 -X2GO_PACK=$3 -X2GO_TYPE=$4 -X2GO_KBD_LAYOUT=$5 -X2GO_KBD_TYPE=$6 -X2GO_SET_KBD=$7 -X2GO_STYPE=$8 -X2GO_CMD=$9 +$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" + +X2GO_GEOMETRY=$1; shift +X2GO_LINK=$1; shift +X2GO_PACK=$1; shift +X2GO_TYPE=$1; shift +X2GO_KBD_LAYOUT=$1; shift +X2GO_KBD_TYPE=$1; shift +X2GO_SET_KBD=$1; shift +X2GO_STYPE=$1; shift +X2GO_CMD=$1; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 @@ -47,15 +50,23 @@ if [ "$X2GO_STYPE" == "S" ]; then SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` SHADOW_USER=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[2]}'` SHADOW_DESKTOP=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[3]}'` - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "shadow session requested: mode $SHADOW_MODE, user: $SHADOW_USER, desktop: $SHADOW_DESKTOP" - echo "suser $SHADOW_USER user $USER " >> /tmp/uagent + test -z $1 && { + + # can this line be removed? + #echo "suser $SHADOW_USER user $USER " >> /tmp/uagent + + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "shadow session requested: mode $SHADOW_MODE, user: $SHADOW_USER, desktop: $SHADOW_DESKTOP" + } || { + SHADREQ_USER=$1; shift + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "preparing shadow session request for user $SHADREQ_USER, agent starts for user ${USER}" + } if [ "$SHADOW_USER" != "$USER" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''" - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@ $USER" - OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@ $USER` + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER" + OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT" if [ "$OUTPUT" == "DENY" ]; then echo "ACCESS DENIED" 1>&2 @@ -185,8 +196,6 @@ fi X2GO_COOKIE=`mcookie` -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${X2GO_LIB}" -export LD_LIBRARY_PATH PATH="${PATH}:${X2GO_BIN}/" export PATH @@ -227,12 +236,15 @@ fi # run x2goserver-extensions for pre-start x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true +SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" + if [ "$X2GO_STYPE" == "S" ]; then - LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & else - LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & fi + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 441b176..d65d752 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -108,11 +108,13 @@ my $user="x2gouser"; unique(display)) "); $sth->execute() or die; + $sth->finish(); my $sth=$dbh->prepare(" create table messages(mess_id varchar(20) primary key, message text) "); $sth->execute() or die; + $sth->finish(); my $sth=$dbh->prepare(" create table user_messages( @@ -120,6 +122,7 @@ my $user="x2gouser"; uname varchar(100) not null) "); $sth->execute() or die; + $sth->finish(); my $sth=$dbh->prepare(" create table used_ports( @@ -128,6 +131,7 @@ my $user="x2gouser"; port integer primary key) "); $sth->execute() or die; + $sth->finish(); my $sth=$dbh->prepare(" create table mounts( @@ -137,6 +141,7 @@ my $user="x2gouser"; primary key(path,client)) "); $sth->execute() or die; + $sth->finish(); my $sth=$dbh->prepare(" CREATE TRIGGER fkd_mounts_session_id @@ -149,6 +154,7 @@ my $user="x2gouser"; END; "); $sth->execute() or die; + $sth->finish(); my $sth=$dbh->prepare(" CREATE TRIGGER fkd_ports_session_id @@ -160,9 +166,11 @@ my $user="x2gouser"; END; "); $sth->execute() or die; - $sth->finish(); - $dbh->disconnect(); + + # undef $dbh should be preferred to $dbh->disconnect(), see + # http://www.perlmonks.org/?node_id=665714 + undef $dbh; chmod(0770, "$dir"); chown('root',$pgid,"$dir"); chmod(0660, "$dbfile"); hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99.8-47-gd578560
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via d578560869faad7bc5e1c7be02d07ac7f725d6be (commit) from 9a2cf4f7db806415601c90866bbde1acd3fd5001 (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 d578560869faad7bc5e1c7be02d07ac7f725d6be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:40:58 2012 +0100 release 3.0.99.9 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0fa2f3b..d8935dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.0.99.9-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.0.99.9): @@ -26,7 +26,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.99.9): - Add Xinerama support. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 25 Nov 2011 11:38:46 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Jan 2012 14:39:57 +0100 x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99.8-46-g9a2cf4f
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 9a2cf4f7db806415601c90866bbde1acd3fd5001 (commit) from 21939b511d26b0bb737fa41c2219e11ce993c842 (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 9a2cf4f7db806415601c90866bbde1acd3fd5001 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:34:05 2012 +0100 Install x2gogetservers to $PREFIX/bin instead of $PREFIX/lib/x2go. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/{lib => bin}/x2gogetservers | 0 2 files changed, 1 insertions(+), 0 deletions(-) rename x2goserver/{lib => bin}/x2gogetservers (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 07f89a3..0fa2f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low - Call x2golistmounts with user privileges instead of using db_getmounts in x2goprint script. - Avoid potentially empty LD_LIBRARY_PATH path in x2goruncommand. + - Install x2gogetservers to $PREFIX/bin instead of $PREFIX/lib/x2go. * Add psmisc package as dependency. * Add new binary package to x2goserver source: x2goserver-pyhoca. * x2goserver package suggests x2goserver-pyhoca. diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/bin/x2gogetservers similarity index 100% rename from x2goserver/lib/x2gogetservers rename to x2goserver/bin/x2gogetservers hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99.8-45-g21939b5
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 21939b511d26b0bb737fa41c2219e11ce993c842 (commit) via 45b1367dfa77432852ce741eb9052f83b242a75c (commit) from 2e398b9c0964748f404b7ad4140d7ae229e98612 (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 21939b511d26b0bb737fa41c2219e11ce993c842 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:30:59 2012 +0100 Avoid potentially empty LD_LIBRARY_PATH path in x2goruncommand. commit 45b1367dfa77432852ce741eb9052f83b242a75c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:30:22 2012 +0100 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 03d8753..07f89a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low - Re-add x2gosetkeyboard via new subproject x2goserver-pyhoca. - Call x2golistmounts with user privileges instead of using db_getmounts in x2goprint script. + - Avoid potentially empty LD_LIBRARY_PATH path in x2goruncommand. * Add psmisc package as dependency. * Add new binary package to x2goserver source: x2goserver-pyhoca. * x2goserver package suggests x2goserver-pyhoca. @@ -21,7 +22,8 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low - Fix potentially empty LD_LIBRARY_PATH in x2gostartagent. [ Oleksandr Shneyder ] - * Xinerama support + * New upstream version (3.0.99.9): + - Add Xinerama support. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 25 Nov 2011 11:38:46 +0100 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 9af731a..b24d2f2 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -46,7 +46,7 @@ export NX_XINERAMA_CONF IMEXIT="false" NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH +test -n $LD_LIBRARY_PATH && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH=$NX_XINERAMA_LIBS export LD_LIBRARY_PATH if [ "$sndsys" == "esd" ]; then hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

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

18 Jan '12

The branch, master has been updated via 0589f7af52d4e8182b119fa598513d98203d708a (commit) from d71fc2fcfd9af5e6638df881b2ed040a08492949 (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 0589f7af52d4e8182b119fa598513d98203d708a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 18 14:26:13 2012 +0100 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 990652b..b9120b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,7 @@ x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low - Multi-display support: support for xinerama (temporarily disabled--support in x2goagent needed) - Add -lXpm in project file. - * Enabled support for Xinerama - + - Enabled support for Xinerama -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 16:17:46 +0100 hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.0.99.8-43-g2e398b9
by git-admin＠x2go.org 18 Jan '12

18 Jan '12

The branch, master has been updated via 2e398b9c0964748f404b7ad4140d7ae229e98612 (commit) from 5ea9eaad648e916e182ee0c3a56c3c49c97ce80f (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 2e398b9c0964748f404b7ad4140d7ae229e98612 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Wed Jan 18 13:23:30 2012 +0100 Xinerama support ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2goresume-session | 6 ++++++ x2goserver/bin/x2goruncommand | 7 +++++++ 3 files changed, 16 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9012d25..03d8753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.99.9): - Fix potentially empty LD_LIBRARY_PATH in x2gostartagent. + [ Oleksandr Shneyder ] + * Xinerama support + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 25 Nov 2011 11:38:46 +0100 x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 16a7f0c..7ad09f4 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -35,6 +35,12 @@ X2GO_ROOT=${HOME}/.x2go X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +NX_XINERAMA_CONF=$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf +if [ -e $NX_XINERAMA_CONF ] +then + rm $NX_XINERAMA_CONF +fi + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" if [ "$X2GO_GEOMETRY" == "" ] diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index d3f0d98..9af731a 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -40,8 +40,15 @@ X2GO_ROOT=${HOME}/.x2go MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput echo "exec $cmd" >> $MESSAGE_FILE +NX_XINERAMA_CONF=$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf +export NX_XINERAMA_CONF + IMEXIT="false" +NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama +LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH + if [ "$sndsys" == "esd" ]; then export ESPEAKER=localhost:$4 elif [ "$sndsys" == "arts" ]; then hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

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

18 Jan '12

The branch, master has been updated via d71fc2fcfd9af5e6638df881b2ed040a08492949 (commit) from 1098f511f85416cc723c64a602fac381d7d215ba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d71fc2fcfd9af5e6638df881b2ed040a08492949 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Wed Jan 18 13:22:48 2012 +0100 Enabled support for Xinerama ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ onmainwindow_part4.cpp | 4 ++-- settingswidget.cpp | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 460386e..990652b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low - Multi-display support: support for xinerama (temporarily disabled--support in x2goagent needed) - Add -lXpm in project file. + * Enabled support for Xinerama + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 16:17:46 +0100 diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 5d8eecd..52b381d 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1148,11 +1148,11 @@ void ONMainWindow::slotXineramaConfigured() else xinSizeInc=-1; #ifdef Q_OS_LINUX + lastDisplayGeometry.setWidth(lastDisplayGeometry.width()+xinSizeInc); XSync(QX11Info::display(),false); XResizeWindow(QX11Info::display(), proxyWinId, - lastDisplayGeometry.width()+xinSizeInc,lastDisplayGeometry.height()); + lastDisplayGeometry.width(),lastDisplayGeometry.height()); XSync(QX11Info::display(),false); - lastDisplayGeometry=proxyWinGeometry(); #endif #ifdef Q_OS_WIN QRect geom; diff --git a/settingswidget.cpp b/settingswidget.cpp index 86c5395..1d1a229 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -270,9 +270,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, kbd->setChecked ( true ); custom->setChecked ( true ); readConfig(); - - cbXinerama->setVisible(false); - cbXinerama->setChecked(false); } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.3-5-g772bfa8
by git-admin＠x2go.org 17 Jan '12

17 Jan '12

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

1 0

nx-libs.git - nx-buildscripts (branch) updated: 21155f218d7f0ce09ea0f2c905075dec4d4132b4
by git-admin＠x2go.org 16 Jan '12

16 Jan '12

The branch, nx-buildscripts has been updated via 21155f218d7f0ce09ea0f2c905075dec4d4132b4 (commit) from 3b5bd5e3aeaa2f5f235fbe06727db7e2f857b4c5 (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 21155f218d7f0ce09ea0f2c905075dec4d4132b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 16 22:59:26 2012 +0100 Change nx-tarballrelease, so that no client-only branch is needed anymore, can be used for nx-libs >= 3.5.0.8. ----------------------------------------------------------------------- Summary of changes: bin/nx-tarballrelease | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/bin/nx-tarballrelease b/bin/nx-tarballrelease index 1184e83..f0e772f 100755 --- a/bin/nx-tarballrelease +++ b/bin/nx-tarballrelease @@ -36,9 +36,11 @@ CHECKOUT="$2" test -n "$CHECKOUT" || usage if [ "x$CHECKOUT" = "xmaster" ] || [ "x$CHECKOUT" = "xserver" ] || [ "x$CHECKOUT" = "xfull" ]; then + MODE="full" CHECKOUT="redist-server/$RELEASE" RELEASE_SUFFIX='-full' elif [ "x$CHECKOUT" = "xclient-only" ] || [ "x$CHECKOUT" = "xclient" ] || [ "x$CHECKOUT" = "xlite" ]; then + MODE="lite" CHECKOUT="redist-client/$RELEASE" RELEASE_SUFFIX='-lite' else @@ -57,17 +59,23 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" -# check out the refspec needed... -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git fetch origin client-only:client-only && git checkout --force ${CHECKOUT} 2>/dev/null || true ) +# prepare patches for lite and full tarball +if [ "x$MODE" = "xfull" ]; then + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file; do cp -a $file doc/applied-patches; done) + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.(full|full\+lite)\.patch" > doc/applied-patches/series) +else + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompshad"* ) + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompext"* ) + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nx-X11"* ) + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(series|debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file; do cp -a $file doc/applied-patches; done) + ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.full\+lite\.patch" > doc/applied-patches/series) +fi # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir doc/ && find debian/patches | egrep -v "(series|debian/patches/[0-9]+a_debian_.*\.patch)" | while read file; do cp -a $file doc/applied-patches; done) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep -v "[0-9]+a_debian_.*\.patch" doc/applied-patches/series) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && QUILT_PATCHES=doc/applied-patches quilt push -a) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mv -f README* doc/) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mv -f debian/changelog doc/changelog) - # remove folders that we do not want to roll into the tarball ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf ".git"* ) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf ".pc"* ) hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2012