The branch, master has been updated via 9aa8514c8a39b4c144fede0e8369962a618f9ddf (commit) via 6888e6a043982ee9c9d8edc17dfb27b7309141a6 (commit) from 6710acd8dc42c4b920b7b202adf660acb61a09b1 (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 9aa8514c8a39b4c144fede0e8369962a618f9ddf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 3 22:23:50 2012 +0100 New bin:package (all): x2goplugin-provider. Provide basic Apache2 configuration for a demo x2goplugin website. commit 6888e6a043982ee9c9d8edc17dfb27b7309141a6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 26 09:57:22 2012 +0200 fix typo fix in x2goclient_de.ts ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 18 ++++++++++++++ debian/x2goplugin-provider.dirs | 3 +++ debian/x2goplugin-provider.install | 2 ++ debian/x2goplugin-provider.links | 1 + onmainwindow.cpp | 5 ++++ provider/etc/x2goplugin-apache.conf | 1 + provider/share/x2goplugin.html | 47 +++++++++++++++++++++++++++++++++++ x2goclient_de.ts | 2 +- 9 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 debian/x2goplugin-provider.dirs create mode 100644 debian/x2goplugin-provider.install create mode 100644 debian/x2goplugin-provider.links delete mode 100644 provider/etc/.placeholder create mode 100644 provider/etc/x2goplugin-apache.conf delete mode 100644 provider/lib/.placeholder delete mode 100644 provider/share/.placeholder create mode 100644 provider/share/x2goplugin.html The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4a13ae0..022234b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Add rdesktop and xfreerdp to Recommends. + Priority: optional. + * New bin:package (all): x2goplugin-provider. Provide basic Apache2 + configuration for a demo x2goplugin website. [ Daniel Lindgren ] * New upstream version (3.99.3.0): diff --git a/debian/control b/debian/control index 9fd9211..1efdc92 100644 --- a/debian/control +++ b/debian/control @@ -74,3 +74,21 @@ Description: X2Go Client (Qt4) as browser plugin You can use it to connect to running sessions and start new sessions. . This package provides x2goclient as Mozilla plugin. + +Package: x2goplugin-provider +Architecture: all +Depends: + ${misc:Depends}, +Recommends: + httpd | apache2, +Description: Provide X2Go Plugin via Apache webserver + X2Go is a serverbased computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package provides an example configuration for providing + the X2Go Plugin via an Apache webserver. diff --git a/debian/x2goplugin-provider.dirs b/debian/x2goplugin-provider.dirs new file mode 100644 index 0000000..9a0e712 --- /dev/null +++ b/debian/x2goplugin-provider.dirs @@ -0,0 +1,3 @@ +usr/share/x2go/plugin +etc/x2go +etc/apache2/conf.d diff --git a/debian/x2goplugin-provider.install b/debian/x2goplugin-provider.install new file mode 100644 index 0000000..84520e2 --- /dev/null +++ b/debian/x2goplugin-provider.install @@ -0,0 +1,2 @@ +provider/etc/x2goplugin-apache.conf etc/x2go/ +provider/share/x2goplugin.html usr/share/x2go/plugin/ diff --git a/debian/x2goplugin-provider.links b/debian/x2goplugin-provider.links new file mode 100644 index 0000000..4ef7bf3 --- /dev/null +++ b/debian/x2goplugin-provider.links @@ -0,0 +1 @@ +etc/x2go/x2goplugin-apache.conf etc/apache2/conf.d/x2goplugin.conf \ No newline at end of file diff --git a/onmainwindow.cpp b/onmainwindow.cpp index a7ff8f3..5e8d3e9 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -9685,6 +9685,11 @@ void ONMainWindow::processSessionConfig() for ( int i=0; i<lines.count(); ++i ) { QString line = lines[i]; + + // strip left/right whitespaces, important for plugin settings via x2goconfig + line.remove(QRegExp("^\\s+")); + line.remove(QRegExp("\\s+$")); + if ( ( line=="-----BEGIN DSA PRIVATE KEY-----" ) || ( line=="-----BEGIN RSA PRIVATE KEY-----" ) ) { diff --git a/provider/etc/.placeholder b/provider/etc/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/provider/etc/x2goplugin-apache.conf b/provider/etc/x2goplugin-apache.conf new file mode 100644 index 0000000..76e827e --- /dev/null +++ b/provider/etc/x2goplugin-apache.conf @@ -0,0 +1 @@ +Alias /x2goplugin.html /usr/share/x2go/plugin/x2goplugin.html diff --git a/provider/lib/.placeholder b/provider/lib/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/provider/share/.placeholder b/provider/share/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/provider/share/x2goplugin.html b/provider/share/x2goplugin.html new file mode 100644 index 0000000..d2a9474 --- /dev/null +++ b/provider/share/x2goplugin.html @@ -0,0 +1,47 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <title>X2Go Application Service</title> + </head> + <body onload="checkPlugin()"> + <div id="x2goplugin"> + <object + src="location" + type="application/x2go" + name="x2goplugin" + palette="background" + height="100%" + hspace="0" + vspace="0" + width="100%" + x2goconfig=" +session=X2Go-Demo-Session +server=localhost +user= +sshport=22 +command=XFCE +rootless=false +sound=true +exportfs=true +speed=adsl +compression=16m-jpeg +quality=9 +dpi=120 +kbdlayout= +kbdtype=auto +showtoolbar=true +showstatusbar=true +usekbd=true +soundsystem=pulse +soundtunnel=true +defsndport=true +print=true +rootless=false +published=false +applications=WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL +"> + </object> + + </div> + </body> +</html> diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 1f9ecb0..66fdb4f 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1200,7 +1200,7 @@ sound system connections through firewalls</source> <message> <location filename="onmainwindow.cpp" line="9985"/> <source>Password:</source> - <translation>Password:</translation> + <translation>Passwort:</translation> </message> <message> <location filename="onmainwindow.cpp" line="9986"/> 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).