The branch, release/4.0.0.x has been updated
via 98fa38c879da3ee1663f8d076163ff365adb63bd (commit)
from 219e46526ad576e5d2866ef93d67a7aba8dd0c3a (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 98fa38c879da3ee1663f8d076163ff365adb63bd
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Mar 30 20:24:11 2013 +0100
Revert "As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension enabled by default."
This reverts commit 219e46526ad576e5d2866ef93d67a7aba8dd0c3a.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 -----
x2goserver/etc/x2goagent.options | 4 +---
2 files changed, 1 insertion(+), 8 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ff7e280..654403a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,6 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
* New upstream version (4.0.0.2):
- Use x2gopath in Perl scripts to set the lib path. (Fixes: #103).
- [ Mike Gabriel ]
- * New upstream version (4.0.0.2):
- - As LP issue #985202 has been fixed, we revert back to keeping the XFIXES
- extension enabled by default.
-
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100
x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options
index bc6c510..afe12f9 100644
--- a/x2goserver/etc/x2goagent.options
+++ b/x2goserver/etc/x2goagent.options
@@ -7,9 +7,7 @@ X2GO_NXAGENT_DEFAULT_OPTIONS=""
# Disable XFIXES.
# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
#
-# As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension
-# enabled by default.
-#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
# Disable GLX, the old mesa version is hopelessly outdated anyways.
# Unbreaks the gnome3 control center
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).
The branch, master has been updated
via 5f4b153ddb457b32ab3ee6a92b6fddd03171b9c7 (commit)
from 2b293833404d142273422f06af4553f45486955f (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 5f4b153ddb457b32ab3ee6a92b6fddd03171b9c7
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Mar 30 19:01:43 2013 +0100
Revert "As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension enabled by default."
This reverts commit 2b293833404d142273422f06af4553f45486955f.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 -----
x2goserver/etc/x2goagent.options | 4 +---
2 files changed, 1 insertion(+), 8 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8a3e972..88b4015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,11 +60,6 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
* New upstream version (4.0.0.2):
- Use x2gopath in Perl scripts to set the lib path. (Fixes: #103).
- [ Mike Gabriel ]
- * New upstream version (4.0.0.2):
- - As LP issue #985202 has been fixed, we revert back to keeping the XFIXES
- extension enabled by default.
-
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100
x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options
index bc6c510..afe12f9 100644
--- a/x2goserver/etc/x2goagent.options
+++ b/x2goserver/etc/x2goagent.options
@@ -7,9 +7,7 @@ X2GO_NXAGENT_DEFAULT_OPTIONS=""
# Disable XFIXES.
# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
#
-# As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension
-# enabled by default.
-#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
# Disable GLX, the old mesa version is hopelessly outdated anyways.
# Unbreaks the gnome3 control center
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).
The branch, release/4.0.0.x has been updated
via 219e46526ad576e5d2866ef93d67a7aba8dd0c3a (commit)
from 44e6743519e92ca1c1520032f2c0b13d81780956 (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 219e46526ad576e5d2866ef93d67a7aba8dd0c3a
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Mar 30 18:36:56 2013 +0100
As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension enabled by default.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 +++++
x2goserver/etc/x2goagent.options | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 654403a..ff7e280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
* New upstream version (4.0.0.2):
- Use x2gopath in Perl scripts to set the lib path. (Fixes: #103).
+ [ Mike Gabriel ]
+ * New upstream version (4.0.0.2):
+ - As LP issue #985202 has been fixed, we revert back to keeping the XFIXES
+ extension enabled by default.
+
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100
x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options
index afe12f9..bc6c510 100644
--- a/x2goserver/etc/x2goagent.options
+++ b/x2goserver/etc/x2goagent.options
@@ -7,7 +7,9 @@ X2GO_NXAGENT_DEFAULT_OPTIONS=""
# Disable XFIXES.
# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
#
-X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+# As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension
+# enabled by default.
+#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
# Disable GLX, the old mesa version is hopelessly outdated anyways.
# Unbreaks the gnome3 control center
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).
The branch, master has been updated
via 2b293833404d142273422f06af4553f45486955f (commit)
from 50d9c0a801d8feffdb72fa0dfdf7d65897b8a10e (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 2b293833404d142273422f06af4553f45486955f
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Mar 30 18:36:56 2013 +0100
As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension enabled by default.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 +++++
x2goserver/etc/x2goagent.options | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 88b4015..8a3e972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,11 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
* New upstream version (4.0.0.2):
- Use x2gopath in Perl scripts to set the lib path. (Fixes: #103).
+ [ Mike Gabriel ]
+ * New upstream version (4.0.0.2):
+ - As LP issue #985202 has been fixed, we revert back to keeping the XFIXES
+ extension enabled by default.
+
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100
x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options
index afe12f9..bc6c510 100644
--- a/x2goserver/etc/x2goagent.options
+++ b/x2goserver/etc/x2goagent.options
@@ -7,7 +7,9 @@ X2GO_NXAGENT_DEFAULT_OPTIONS=""
# Disable XFIXES.
# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
#
-X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+# As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension
+# enabled by default.
+#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
# Disable GLX, the old mesa version is hopelessly outdated anyways.
# Unbreaks the gnome3 control center
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).
A page in your DokuWiki was added or changed. Here are the details:
Date : 2013/03/30 15:57
Browser : Mozilla/5.0 (Windows NT 5.1; rv:19.0) Gecko/20100101 Firefox/19.0
IP-Address : 88.217.108.174
Hostname : ppp-88-217-108-174.dynamic.mnet-online.de
Old Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2goplugin?rev=1364624817
New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2goplugin
Edit Summary: Higlighting and stuff
User : morty
@@ -1,11 +1,5 @@
====== X2Go Browser Plugin ======
-
- FIXME FIXME FIXME FIXME
-
- Needs correct formating of html page contents.
-
- FIXME FIXME FIXME FIXME
Using the packages x2goplugin on the client and x2goplugin-provider on the server offers X2Go's functionality within various Browsers, such as Firefox, Chrome, Konqueror and Epiphany. This happens by providing a special website via a webserver, for example apache. The X2GoPlugin receives its configuration via this website.
**Prerequirements:**
@@
-16,54 +10,48 @@
===== Client ======
- ==== Installation Debian GNU/Linux ====
- <code>
- apt-get install x2goplugin
- </code>
-
- ==== Installation Ubuntu ====
- <code>
+ ==== Installation Ubuntu and Debian GNU/Linux ====
+ <code bash>
apt-get install x2goplugin
</code>
+ After restarting the browser, the plugin is ready to use.
==== Installation Windows ====
- not yet available.
+ Please help us improve the wiki and write installation instructions.
==== Installation OSX ====
- Not yet available.
+ Please help us improve the wiki and write installation instructions.
- This finishes installing X2GoPlugin for the client. After restarting the browser it is ready to use.
- ====== Server ======
- ==== Installation Debian GNU/Linux ====
- <code>
- apt-get install apache2 x2goplugin-provider
- </code>
- ==== Installation Ubuntu ====
- <code>
+ ===== Server =====
+ ==== Installation Ubuntu / Debian GNU/Linux ====
+ <code bash>
apt-get install
apache2 x2goplugin-provider
</code>
- This installs the necessary files and dependencies. The plugin is instantly usable on the server via localhost/x2goplugin.html. Using it on the server is not the desired scenario, so we need to change the configuration. The file x2goplugin.html lies at /usr/share/x2go/plugin/.
+ This installs the necessary files and dependencies. The plugin is instantly usable on the server via ''localhost/x2goplugin.html''. Using it on the server is not the desired scenario, so we need to change the configuration. The file ''x2goplugin.html'' lies at ''/usr/share/x2go/plugin/''.
It is recommended to create a backup of the original file before modifying it.
- <code>
+ ==== Quick Setup ====
+ If you want a quick setup, e.g. for testing, best make backup of ''/usr/share/x2go/plugin/x2goplugin.html''. The a bit more complicated, but robust way is described below.
+
+ <code bash>
cp /usr/share/x2go/plugin/x2goplugin.html
/usr/share/x2go/plugin/x2goplugin.html.orig
</code>
- The file's content can then be modified to reflect your own requirements. At a minimum you should substitute "server=localhost" with your server's public IP / hostname. After that you can access X2Go via your browser:
+ The file's content can then be modified to reflect your own requirements. At a minimum you should substitute ''server=localhost'' with your server's public IP / hostname. After that you can access X2Go via your browser:
[[http://<your-server's-IP-or-hostname>/x2goplugin.html]]
This is the original content of the file:
- ''<code>''
+ <file html x2goplugin.html>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>X2Go Application Service</title>
@@ -109,21 +97,24 @@
</div>
</body>
</html>
- ''</code>''
+ </file>
+
+ ==== Setup ====
+
+ You can certainly also move the file x2goplugin.html into ''/var/www''. Then it is recommended to
remove the link ''x2goplugin.conf'' within ''/etc/apache2/conf.d'', which is just a link to ''/etc/x2goplugin-apache.conf''.
- You can certainly also move the file x2goplugin.html into /var/www. Then it is recommended to remove the link x2goplugin.conf within /etc/apache2/conf.d, which is just a link to /etc/x2goplugin-apache.conf.
- <code>
+ <code bash>
ls -al /etc/apache2/conf.d/x2goplugin.conf
lrwxrwxrwx 1 root root 33 Mär 22 23:42 /etc/apache2/conf.d/x2goplugin.conf -> ../../x2go/x2goplugin-apache.conf
root@x2goserver:/etc/apache2/conf.d
</code>
- This file contains the alias which defines an alias for the url [[http://<your-server's-IP-or-hostname>/x2goplugin.html]]. (The URL http://<your-server's-IP-or-hostname> still delivers the expected file /var/www/index.html.)
+ This file contains the alias which defines an alias for the url [[http://<your-server's-IP-or-hostname>/x2goplugin.html]]. (The URL [[http://<your-server's-IP-or-hostname>]] still delivers the
expected file ''/var/www/index.html''.)
- <code>
+ <code bash>
cat /etc/x2go/x2goplugin-apache.conf
Alias /x2goplugin.html /usr/share/x2go/plugin/x2goplugin.html
</code>
--
This mail was generated by DokuWiki at
http://wiki.x2go.org/
A page in your DokuWiki was added or changed. Here are the details:
Date : 2013/03/30 06:23
Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1364.160 Chrome/25.0.1364.160 Safari/537.22
IP-Address : 88.74.159.43
Hostname : dslb-088-074-159-043.pools.arcor-ip.net
Old Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2goplugin?rev=1364624513
New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2goplugin
Edit Summary:
User : tobias
@@ -121,6 +121,8 @@
</code>
This file contains the alias which defines an alias for the url [[http://<your-server's-IP-or-hostname>/x2goplugin.html]]. (The URL http://<your-server's-IP-or-hostname> still delivers the expected file /var/www/index.html.)
+ <code>
cat /etc/x2go/x2goplugin-apache.conf
Alias /x2goplugin.html /usr/share/x2go/plugin/x2goplugin.html
+ </code>
--
This mail was generated by DokuWiki at
http://wiki.x2go.org/