The branch, build-baikal has been updated
via ad9a7e6f8173f342cdddcc824ef1f15f0c836511 (commit)
from ee0b2b616b2764ad2da6ec54de8fce48fce62f51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/…
[View More]changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index be6c54e..a01fa12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
[Mike Gabriel]
* Rename x2goumount_session calls to x2goumount-session calls in x2goserver
internal scripts.
+ * React to bug #627990, prefer man2html-base over man2html.
[Martin Oehler]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/control b/debian/control
index cac769d..7a64da7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Build-Depends:
debhelper (>= 7.0.50~),
- man2html
+ man2html-base | man2html
Standards-Version: 3.9.2
Homepage: http://code.x2go.org/releases/source/x2goserver
Vcs-Git: git://code.x2go.org/x2goserver.git
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
[View Less]
The branch, build-baikal has been updated
via fc40b4b0365e61dabf9a6a2c16e3ef0a6bbdae6e (commit)
from ff6e33487a414ef58c4a7c2fd7ffceba9ecd42b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/…
[View More]changelog | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3e6983f..b098c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
* splitting up x2goserver package into x2goserver and x2goserver-extras
- (x2goserver provides full functionality to legacy x2goclient, x2goserver-extras
- is a container for add-on tools/scripts needed for other client implementations
- like Python X2go.
+ (x2goserver provides full functionality to legacy x2goclient,
+ x2goserver-extras is a container for add-on tools/scripts needed for
+ other client implementations like Python X2go.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 31 May 2011 10:57:15 +0200
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).
[View Less]
The branch, build-baikal has been updated
via 62f39bff4dd294f6973c88f5b54eabace85d5b3e (commit)
from fc40b4b0365e61dabf9a6a2c16e3ef0a6bbdae6e (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:
.../html/…
[View More]man8/x2gosetkeyboard.8.html | 2 +-
.../.build_man2html/html/man8/x2goversion.8.html | 2 +-
.../html/man8/x2gocleansessions.8.html | 2 +-
.../html/man8/x2golistsessions.8.html | 2 +-
.../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +-
.../.build_man2html/html/man8/x2goprint.8.html | 2 +-
.../html/man8/x2goresume-session.8.html | 2 +-
.../html/man8/x2goruncommand.8.html | 2 +-
.../html/man8/x2gostartagent.8.html | 2 +-
.../html/man8/x2gosuspend-session.8.html | 2 +-
.../html/man8/x2goterminate-session.8.html | 2 +-
.../html/man8/x2goumount-session.8.html | 2 +-
.../.build_man2html/html/man8/x2goumount.8.html | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
index 334b8de..5d23427 100644
--- a/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
+++ b/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
@@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
index 2f78649..a3c66a0 100644
--- a/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
+++ b/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
@@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
index fe99a4d..8ff44bd 100644
--- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
index 69ab1a7..34341c8 100644
--- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
index faf1196..e7a53ab 100644
--- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
index fc1bbca..28eb6d7 100644
--- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
index 0cd8687..43a0d65 100644
--- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
index 4920a79..66d82d1 100644
--- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
index 27b8360..44edba2 100644
--- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
index b6dea5c..339da68 100644
--- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
index e927b5c..d4ed55e 100644
--- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
index 720fd4c..da29c42 100644
--- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount.8.html b/x2goserver/.build_man2html/html/man8/x2goumount.8.html
index f3efcce..1a8797e 100644
--- a/x2goserver/.build_man2html/html/man8/x2goumount.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goumount.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:22:50 GMT, May 31, 2011
+Time: 09:53:54 GMT, May 31, 2011
</BODY>
</HTML>
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).
[View Less]
The branch, build-baikal has been updated
via ff6e33487a414ef58c4a7c2fd7ffceba9ecd42b1 (commit)
from cf6abd4c1dc2ff5e9536787c4482f16f68816f99 (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:
Makefile …
[View More] | 20 +++++++++++++++++++-
x2goserver-extras/Makefile | 4 +++-
x2goserver/Makefile | 4 +++-
3 files changed, 25 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 98734af..f702bca 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,23 @@
#!/usr/bin/make -f
-%:
+all: build
+
+build: build-indep
+
+clean:
cd x2goserver && make $@
cd x2goserver-extras && make $@
+
+build-indep:
+ cd x2goserver && make $@
+ cd x2goserver-extras && make $@
+
+install:
+ cd x2goserver && make $@
+ cd x2goserver-extras && make $@
+
+uninstall:
+ cd x2goserver && make $@
+ cd x2goserver-extras && make $@
+
+
diff --git a/x2goserver-extras/Makefile b/x2goserver-extras/Makefile
index 943529c..9ac9491 100755
--- a/x2goserver-extras/Makefile
+++ b/x2goserver-extras/Makefile
@@ -31,7 +31,9 @@ MAN2HTML_DEST = .build_man2html/html
all: clean build
-build: build_man2html
+build: build-indep
+
+build-indep: build_man2html
build_man2html:
mkdir -p $(MAN2HTML_DEST)
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 8defaee..765f17f 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -31,7 +31,9 @@ MAN2HTML_DEST = .build_man2html/html
all: clean build
-build: build_man2html
+build: build-indep
+
+build-indep: build_man2html
build_man2html:
mkdir -p $(MAN2HTML_DEST)
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).
[View Less]
The branch, build-baikal has been updated
via 54f9ba4f953caaf0390ba4df99df471cd5772060 (commit)
from 3be6695368cc2d9e522dff419a43426fba03e829 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/…
[View More]changelog | 10 ++++++++++
x2goserver/bin/x2goumount-session | 3 ---
2 files changed, 10 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 68c8940..332a4d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
+
+ [Mike Gabriel]
+ * no changes so far
+
+ [Martin Oehler]
+ * Removes old debug code fragment, fixes x2golistsessions parsing.
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 05 Jun 2011 20:44:32 +0200
+
x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
* splitting up x2goserver package into x2goserver and x2goserver-extensions
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 9f5e95f..92228a6 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -45,9 +45,6 @@ if($only_path)
my $display=db_getdisplay($session);
-
-print "DISPLAY=$display\n";
-
my @outp=db_getmounts($session);
my $i;
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).
[View Less]
The branch, build-baikal has been updated
via 5e65654724f5b9fc9e76260fe4a1ef8182af3b3b (commit)
from d64013f1b0ac2d5de341b5acddb29223a1e98e6d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/…
[View More]x2goserver-extensions.dirs | 3 +
debian/x2goserver-extensions.docs | 1 +
debian/x2goserver-extensions.install | 2 +
debian/x2goserver-extensions.manpages | 1 +
.../html/man8/x2gosetkeyboard.8.html | 26 ++++++--
.../.build_man2html/html/man8/x2goversion.8.html | 69 ++++++++++++++++++++
{x2goserver => x2goserver-extensions}/Makefile | 48 +++++++-------
.../VERSION.x2goserver-extensions | 0
x2goserver-extensions/bin/x2gosetkeyboard | 60 +++++++++++++++++
x2goserver-extensions/bin/x2goversion | 47 +++++++++++++
x2goserver-extensions/man/man8/x2gosetkeyboard.8 | 29 ++++++++
x2goserver-extensions/man/man8/x2goversion.8 | 35 ++++++++++
12 files changed, 290 insertions(+), 31 deletions(-)
create mode 100644 debian/x2goserver-extensions.dirs
create mode 100644 debian/x2goserver-extensions.docs
create mode 100644 debian/x2goserver-extensions.install
create mode 100644 debian/x2goserver-extensions.manpages
copy x2goserver/.build_man2html/html/man8/x2goprint.8.html => x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html (55%)
create mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
copy {x2goserver => x2goserver-extensions}/Makefile (60%)
copy x2goserver/VERSION.x2goserver => x2goserver-extensions/VERSION.x2goserver-extensions (100%)
create mode 100755 x2goserver-extensions/bin/x2gosetkeyboard
create mode 100755 x2goserver-extensions/bin/x2goversion
create mode 100644 x2goserver-extensions/man/man8/x2gosetkeyboard.8
create mode 100644 x2goserver-extensions/man/man8/x2goversion.8
The diff of changes is:
diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-extensions.dirs
new file mode 100644
index 0000000..45adc59
--- /dev/null
+++ b/debian/x2goserver-extensions.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/x2go
+usr/share/x2go/versions
diff --git a/debian/x2goserver-extensions.docs b/debian/x2goserver-extensions.docs
new file mode 100644
index 0000000..f000f68
--- /dev/null
+++ b/debian/x2goserver-extensions.docs
@@ -0,0 +1 @@
+x2goserver-extensions/.build_man2html/html
diff --git a/debian/x2goserver-extensions.install b/debian/x2goserver-extensions.install
new file mode 100644
index 0000000..8263b77
--- /dev/null
+++ b/debian/x2goserver-extensions.install
@@ -0,0 +1,2 @@
+x2goserver-extensions/bin/x2go* /usr/bin/
+x2goserver-extensions/VERSION.x2goserver-extensions /usr/share/x2go/versions/
\ No newline at end of file
diff --git a/debian/x2goserver-extensions.manpages b/debian/x2goserver-extensions.manpages
new file mode 100644
index 0000000..1dec58d
--- /dev/null
+++ b/debian/x2goserver-extensions.manpages
@@ -0,0 +1 @@
+x2goserver-extensions/man/man8/*
\ No newline at end of file
diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
similarity index 55%
copy from x2goserver/.build_man2html/html/man8/x2goprint.8.html
copy to x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
index d71bba5..cff91de 100644
--- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html
+++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
@@ -1,31 +1,42 @@
Content-type: text/html
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goprint</TITLE>
+<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE>
</HEAD><BODY>
-<H1>x2goprint</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
+<H1>x2gosetkeyboard</H1>
+Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A>
<A HREF="../index.html">Return to Main Contents</A><HR>
<A NAME="lbAB"> </A>
<H2>NAME</H2>
-x2goprint - X2go Server Script
+x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client
<A NAME="lbAC"> </A>
<H2>SYNOPSIS</H2>
-<B>x2goprint</B>
+<B>x2gosetkeyboard</B>
<P>
<A NAME="lbAD"> </A>
<H2>DESCRIPTION</H2>
-<B>x2goprint</B> is one of many scripts belonging to X2go Server.
+<B>x2gosetkeyboard</B> looks for a 'keyboard' file in the X2go session directory and introspects
+the X2go session keyboard settings requested from the client side.
+<P>
+
+If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
+will be raised).
<P>
<A NAME="lbAE"> </A>
+<H2>FILES</H2>
+
+${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
+<P>
+
+<A NAME="lbAF"> </A>
<H2>AUTHOR</H2>
This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project
@@ -38,7 +49,8 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
<DT><A HREF="#lbAB">NAME</A><DD>
<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
+<DT><A HREF="#lbAE">FILES</A><DD>
+<DT><A HREF="#lbAF">AUTHOR</A><DD>
</DL>
<HR>
This document was created by
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
new file mode 100644
index 0000000..458ec41
--- /dev/null
+++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
@@ -0,0 +1,69 @@
+Content-type: text/html
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML><HEAD><TITLE>Man page of x2goversion</TITLE>
+</HEAD><BODY>
+<H1>x2goversion</H1>
+Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A>
+<A HREF="../index.html">Return to Main Contents</A><HR>
+
+<A NAME="lbAB"> </A>
+<H2>NAME</H2>
+
+x2goversion - Retrieve Code Versions of X2go Server Components
+<A NAME="lbAC"> </A>
+<H2>SYNOPSIS</H2>
+
+
+
+
+<B>x2goversion [<x2go-component>]</B>
+<P>
+<A NAME="lbAD"> </A>
+<H2>DESCRIPTION</H2>
+
+<B>x2goversion</B> allows to retrieve code versions of X2go server components.
+<P>
+
+If the
+<B>[<x2go-component>]</B> parameter is omitted then a list of all available X2go server
+component names and versions is listed.
+<P>
+
+If an X2go component is specified with the <B>[<x2go-component>]</B> parameter, then only the
+component's version is printed to stdout.
+<P>
+
+The <B>x2goversion</B> tool can be used by X2go client implementations to query server-side versions
+of X2go components.
+<P>
+
+<A NAME="lbAE"> </A>
+<H2>FILES</H2>
+
+/usr/share/x2go/versions/VERSION.*
+<P>
+
+<A NAME="lbAF"> </A>
+<H2>AUTHOR</H2>
+
+This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project
+(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A>
+<P>
+
+<HR>
+<A NAME="index"> </A><H2>Index</H2>
+<DL>
+<DT><A HREF="#lbAB">NAME</A><DD>
+<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
+<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
+<DT><A HREF="#lbAE">FILES</A><DD>
+<DT><A HREF="#lbAF">AUTHOR</A><DD>
+</DL>
+<HR>
+This document was created by
+<A HREF="/cgi-bin/man/man2html">man2html</A>,
+using the manual pages.<BR>
+Time: 10:13:24 GMT, May 31, 2011
+</BODY>
+</HTML>
diff --git a/x2goserver/Makefile b/x2goserver-extensions/Makefile
similarity index 60%
copy from x2goserver/Makefile
copy to x2goserver-extensions/Makefile
index 765f17f..c7ea989 100755
--- a/x2goserver/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -14,14 +14,14 @@ DESTDIR=
PREFIX=/usr/local
ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
-SBINDIR=$(PREFIX)/sbin
-LIBDIR=$(PREFIX)/lib/x2go
+#SBINDIR=$(PREFIX)/sbin
+#LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
-SHAREDIR=$(PREFIX)/share/x2go
+#SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && ls)
-SBIN_SCRIPTS=$(shell cd sbin && ls)
-LIB_FILES=$(shell cd lib && ls)
+#SBIN_SCRIPTS=$(shell cd sbin && ls)
+#LIB_FILES=$(shell cd lib && ls)
man_pages = `cd man && find * -type f`
@@ -49,18 +49,18 @@ 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)$(SBINDIR)
+# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
- $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
- $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
+# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
+# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
install_config:
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
- $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
- $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
+# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
+# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
+# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
+# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
@@ -71,22 +71,22 @@ install_man:
install_version:
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
- $(INSTALL_FILE) VERSION.x2goserver $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
+ $(INSTALL_FILE) VERSION.x2goserver-extras $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras
uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
uninstall_scripts:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
- for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
- for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
- $(RM_DIR) $(DESTDIR)$(LIBDIR)
+# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
+# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
+# $(RM_DIR) $(DESTDIR)$(LIBDIR)
uninstall_config:
- $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
- $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
- $(RM_DIR) $(DESTDIR)$(ETCDIR)
- $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
- $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
+# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
+# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
+# $(RM_DIR) $(DESTDIR)$(ETCDIR)
+# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
+# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
uninstall_man:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
@@ -94,5 +94,5 @@ uninstall_man:
$(RM_DIR) $(DESTDIR)$(MANDIR)
uninstall_version:
- $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
+ $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
$(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver-extensions/VERSION.x2goserver-extensions
similarity index 100%
copy from x2goserver/VERSION.x2goserver
copy to x2goserver-extensions/VERSION.x2goserver-extensions
diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard
new file mode 100755
index 0000000..022f97d
--- /dev/null
+++ b/x2goserver-extensions/bin/x2gosetkeyboard
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
+# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de>
+
+set -e
+
+# set up paths
+X2GO_SESSION_ROOT=${HOME}/.x2go
+X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION}
+
+# client keyboard configuration
+X2GO_CLIENT_KBD_FILE=${X2GO_SESSION_DIR}/keyboard
+
+test -f ${X2GO_CLIENT_KBD_FILE} || exit 0
+
+read_keyboard_file() {
+
+ # retrieve keyboard settings from keyboard file in X2go session dir
+ XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+ XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+ XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+ XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+ XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+
+}
+
+update_keymap() {
+
+ # prepare for setxkbmap call
+ [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES"
+ [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL"
+ [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT"
+ [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT"
+ [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS"
+
+ # update keyboard map
+ setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS
+}
+
+### main ###
+read_keyboard_file
+update_keymap
diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver-extensions/bin/x2goversion
new file mode 100755
index 0000000..64dd758
--- /dev/null
+++ b/x2goserver-extensions/bin/x2goversion
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
+# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de>
+
+X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions"
+
+get_version() {
+ cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1
+}
+
+if [ -n "$1" ]; then
+ X2GO_COMPONENT="$1"
+ X2GO_COMPONENT_VERFILE="${X2GO_VERSIONS_BASEPATH}/VERSION.${X2GO_COMPONENT}"
+
+ if [ -f "${X2GO_COMPONENT_VERFILE}" ]; then
+ echo "$(get_version ${X2GO_COMPONENT_VERFILE})"
+ else
+ echo "Version information for X2go component '$X2GO_COMPONENT' is not available." >&1
+ fi
+else
+ cd ${X2GO_VERSIONS_BASEPATH}
+ for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do
+ X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)"
+ X2GO_COMPONENT_VERSION="$(get_version $compfile)"
+ echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}"
+ done
+ cd - >/dev/null
+fi
+
diff --git a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8
new file mode 100644
index 0000000..ff9a1d9
--- /dev/null
+++ b/x2goserver-extensions/man/man8/x2gosetkeyboard.8
@@ -0,0 +1,29 @@
+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
+.SH NAME
+x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBx2gosetkeyboard\fR
+
+.SH DESCRIPTION
+\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects
+the X2go session keyboard settings requested from the client side.
+.PP
+If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
+will be raised).
+.PP
+.SH FILES
+${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/x2goserver-extensions/man/man8/x2goversion.8 b/x2goserver-extensions/man/man8/x2goversion.8
new file mode 100644
index 0000000..a1ea984
--- /dev/null
+++ b/x2goserver-extensions/man/man8/x2goversion.8
@@ -0,0 +1,35 @@
+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
+.SH NAME
+x2goversion \- Retrieve Code Versions of X2go Server Components
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBx2goversion [<x2go-component>]\fR
+
+.SH DESCRIPTION
+\fBx2goversion\fR allows to retrieve code versions of X2go server components.
+.PP
+If the
+\fB[<x2go-component>]\fR parameter is omitted then a list of all available X2go server
+component names and versions is listed.
+.PP
+If an X2go component is specified with the \fB[<x2go-component>]\fR parameter, then only the
+component's version is printed to stdout.
+.PP
+The \fBx2goversion\fR tool can be used by X2go client implementations to query server-side versions
+of X2go components.
+.PP
+.SH FILES
+/usr/share/x2go/versions/VERSION.*
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
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).
[View Less]
The branch, build-baikal has been updated
via 3be6695368cc2d9e522dff419a43426fba03e829 (commit)
from 5e65654724f5b9fc9e76260fe4a1ef8182af3b3b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/…
[View More]control | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/control b/debian/control
index 67e052b..cac769d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
Uploaders:
Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Build-Depends:
- debhelper (>= 7.0.50~)
+ debhelper (>= 7.0.50~),
+ man2html
Standards-Version: 3.9.2
Homepage: http://code.x2go.org/releases/source/x2goserver
Vcs-Git: git://code.x2go.org/x2goserver.git
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
[View Less]
The branch, build-baikal has been updated
via 9cdeea70167490c2257fc905a7b2364aa4a58e2f (commit)
from 62f39bff4dd294f6973c88f5b54eabace85d5b3e (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:
Makefile …
[View More] | 8 +-
debian/changelog | 8 +-
debian/control | 25 +++--
debian/copyright | 17 ++--
debian/x2goserver-extras.dirs | 3 -
debian/x2goserver-extras.docs | 1 -
debian/x2goserver-extras.install | 2 -
debian/x2goserver-extras.manpages | 1 -
.../html/man8/x2gosetkeyboard.8.html | 61 ------------
.../.build_man2html/html/man8/x2goversion.8.html | 69 --------------
x2goserver-extras/Makefile | 98 --------------------
x2goserver-extras/VERSION.x2goserver-extras | 1 -
x2goserver-extras/bin/x2gosetkeyboard | 60 ------------
x2goserver-extras/bin/x2goversion | 47 ----------
x2goserver-extras/man/man8/x2gosetkeyboard.8 | 29 ------
x2goserver-extras/man/man8/x2goversion.8 | 35 -------
16 files changed, 32 insertions(+), 433 deletions(-)
delete mode 100644 debian/x2goserver-extras.dirs
delete mode 100644 debian/x2goserver-extras.docs
delete mode 100644 debian/x2goserver-extras.install
delete mode 100644 debian/x2goserver-extras.manpages
delete mode 100644 x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
delete mode 100644 x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
delete mode 100755 x2goserver-extras/Makefile
delete mode 100644 x2goserver-extras/VERSION.x2goserver-extras
delete mode 100755 x2goserver-extras/bin/x2gosetkeyboard
delete mode 100755 x2goserver-extras/bin/x2goversion
delete mode 100644 x2goserver-extras/man/man8/x2gosetkeyboard.8
delete mode 100644 x2goserver-extras/man/man8/x2goversion.8
The diff of changes is:
diff --git a/Makefile b/Makefile
index f702bca..444112f 100755
--- a/Makefile
+++ b/Makefile
@@ -6,18 +6,18 @@ build: build-indep
clean:
cd x2goserver && make $@
- cd x2goserver-extras && make $@
+ cd x2goserver-extensions && make $@
build-indep:
cd x2goserver && make $@
- cd x2goserver-extras && make $@
+ cd x2goserver-extensions && make $@
install:
cd x2goserver && make $@
- cd x2goserver-extras && make $@
+ cd x2goserver-extensions && make $@
uninstall:
cd x2goserver && make $@
- cd x2goserver-extras && make $@
+ cd x2goserver-extensions && make $@
diff --git a/debian/changelog b/debian/changelog
index b098c95..a805fc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
- * splitting up x2goserver package into x2goserver and x2goserver-extras
- (x2goserver provides full functionality to legacy x2goclient,
- x2goserver-extras is a container for add-on tools/scripts needed for
- other client implementations like Python X2go.
+ * splitting up x2goserver package into x2goserver and x2goserver-extensions
+ (x2goserver provides full functionality to legacy x2goclient,
+ x2goserver-extensions is a container/namespace for add-on tools/scripts needed
+ for other client implementations like Python X2go.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 31 May 2011 10:57:15 +0200
diff --git a/debian/control b/debian/control
index ecacf72..67e052b 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Recommends:
x11-xkb-utils,
x11-xserver-utils,
xinit,
- x2goserver-extras (= ${source:Version})
+ x2goserver-extensions (= ${source:Version})
Replaces:
x2goserver-one,
x2goserver-home,
@@ -52,17 +52,21 @@ Description: X2go server daemon scripts
This package contains the main daemon and tools for
X2go server-side session administrations.
.
- The set of tools and scripts in this package are
- sufficient for running the X2go project's legacy
- x2goclient on the client-side.
+ The x2goserver package provides full functionality
+ for running the X2go project's legacy X2go client
+ (x2goclient) on the client-side.
+ .
+ However, if you intend using other client implementations
+ of X2go make sure that you also have X2go server
+ extensions package (x2goserver-extensions) installed.
-Package: x2goserver-extras
+Package: x2goserver-extensions
Architecture: all
Depends:
${misc:Depends},
x2goserver (= ${source:Version}),
x11-xkb-utils
-Description: X2go server daemon scripts
+Description: X2go server daemon scripts (extensions)
X2go is a serverbased computing environment with
- session resuming
- low bandwith support
@@ -71,5 +75,10 @@ Description: X2go server daemon scripts
- audio support
- authentication by smartcard and USB stick
.
- This package contains the main daemon and tools for
- X2go server-side session administrations.
+ The X2go server extension namespace offers contributors
+ to add script functionality to X2go that is not
+ needed/ignored by the legacy X2go client (x2goclient).
+ .
+ Make sure you have this package installed on your server
+ if you want non-legacy X2go clients to be able to
+ access your server without lack of features.
diff --git a/debian/copyright b/debian/copyright
index 02049e7..23cc85f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,5 @@
Upstream Authors:
-x2goserver:
- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
- Heinz-M. Graesing <heinz-m.graesing(a)obviously-nice.de>
-
-x2goserver-extras
- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
Heinz-M. Graesing <heinz-m.graesing(a)obviously-nice.de>
@@ -26,14 +20,17 @@ along with this program; if not, write to the
Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-Copyright (C) 2007-2011 Oleksandr Shneyder (x2goserver, x2goserver-extras)
+Copyright (C) 2007-2011 Oleksandr Shneyder
oleksandr.shneyder(a)obviously-nice.de
-Copyright (C) 2007-2011 Heinz-Markus Graesing (x2goserver, x2goserver-extras)
+Copyright (C) 2007-2011 Heinz-Markus Graesing
heinz-m.graesing(a)obviously-nice.de
-Copyright (C) 2011 Mike Gabriel (x2goserver-extras)
-mike.gabriel(a)das-netzwerkteam.de
+Upstream contributors to x2goserver-extensions:
+
+Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>:
+ * x2goversion
+ * x2gosetkeyboard
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/x2goserver-extras.dirs b/debian/x2goserver-extras.dirs
deleted file mode 100644
index 45adc59..0000000
--- a/debian/x2goserver-extras.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/x2go
-usr/share/x2go/versions
diff --git a/debian/x2goserver-extras.docs b/debian/x2goserver-extras.docs
deleted file mode 100644
index f8fc077..0000000
--- a/debian/x2goserver-extras.docs
+++ /dev/null
@@ -1 +0,0 @@
-x2goserver-extras/.build_man2html/html
diff --git a/debian/x2goserver-extras.install b/debian/x2goserver-extras.install
deleted file mode 100644
index 695ab94..0000000
--- a/debian/x2goserver-extras.install
+++ /dev/null
@@ -1,2 +0,0 @@
-x2goserver-extras/bin/x2go* /usr/bin/
-x2goserver-extras/VERSION.x2goserver-extras /usr/share/x2go/versions/
\ No newline at end of file
diff --git a/debian/x2goserver-extras.manpages b/debian/x2goserver-extras.manpages
deleted file mode 100644
index 0e17946..0000000
--- a/debian/x2goserver-extras.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2goserver-extras/man/man8/*
\ No newline at end of file
diff --git a/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
deleted file mode 100644
index 5d23427..0000000
--- a/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
+++ /dev/null
@@ -1,61 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE>
-</HEAD><BODY>
-<H1>x2gosetkeyboard</H1>
-Section: X2go Server Tool (8)<BR>Updated: 30 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-<B>x2gosetkeyboard</B>
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gosetkeyboard</B> looks for a 'keyboard' file in the X2go session directory and introspects
-the X2go session keyboard settings requested from the client side.
-<P>
-
-If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
-will be raised).
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>FILES</H2>
-
-${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">FILES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
deleted file mode 100644
index a3c66a0..0000000
--- a/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
+++ /dev/null
@@ -1,69 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goversion</TITLE>
-</HEAD><BODY>
-<H1>x2goversion</H1>
-Section: X2go Server Tool (8)<BR>Updated: 29 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goversion - Retrieve Code Versions of X2go Server Components
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-<B>x2goversion [<x2go-component>]</B>
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goversion</B> allows to retrieve code versions of X2go server components.
-<P>
-
-If the
-<B>[<x2go-component>]</B> parameter is omitted then a list of all available X2go server
-component names and versions is listed.
-<P>
-
-If an X2go component is specified with the <B>[<x2go-component>]</B> parameter, then only the
-component's version is printed to stdout.
-<P>
-
-The <B>x2goversion</B> tool can be used by X2go client implementations to query server-side versions
-of X2go components.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>FILES</H2>
-
-/usr/share/x2go/versions/VERSION.*
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">FILES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver-extras/Makefile b/x2goserver-extras/Makefile
deleted file mode 100755
index 9ac9491..0000000
--- a/x2goserver-extras/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/make -f
-
-SRC_DIR=$(CURDIR)
-SHELL=/bin/bash
-
-INSTALL_DIR=install -d -o root -g root -m 755
-INSTALL_FILE=install -o root -g root -m 644
-INSTALL_PROGRAM=install -o root -g root -m 755
-
-RM_FILE=rm -f
-RM_DIR=rmdir -p --ignore-fail-on-non-empty
-
-DESTDIR=
-PREFIX=/usr/local
-ETCDIR=/etc/x2go
-BINDIR=$(PREFIX)/bin
-#SBINDIR=$(PREFIX)/sbin
-#LIBDIR=$(PREFIX)/lib/x2go
-MANDIR=$(PREFIX)/share/man
-#SHAREDIR=$(PREFIX)/share/x2go
-
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-
-man_pages = `cd man && find * -type f`
-
-MAN2HTML_BIN = man2html
-MAN2HTML_SRC = man
-MAN2HTML_DEST = .build_man2html/html
-
-all: clean build
-
-build: build-indep
-
-build-indep: build_man2html
-
-build_man2html:
- mkdir -p $(MAN2HTML_DEST)
- for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
- for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
-
-clean: clean_man2html
-
-clean_man2html:
- rm -rf `dirname $(MAN2HTML_DEST)`
-
-install: install_scripts install_config install_man install_version
-
-install_scripts:
- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
- $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
-# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
-# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
-
-install_config:
-# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
-# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
-# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
-# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
-# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
-
-install_man:
- $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
- $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
- $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
-
-install_version:
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
- $(INSTALL_FILE) VERSION.x2goserver-extras $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras
-
-uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
-
-uninstall_scripts:
- for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
-# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
-# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
-# $(RM_DIR) $(DESTDIR)$(LIBDIR)
-
-uninstall_config:
-# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
-# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
-# $(RM_DIR) $(DESTDIR)$(ETCDIR)
-# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
-# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
-
-uninstall_man:
- for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
- for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
- $(RM_DIR) $(DESTDIR)$(MANDIR)
-
-uninstall_version:
- $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras
- $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
diff --git a/x2goserver-extras/VERSION.x2goserver-extras b/x2goserver-extras/VERSION.x2goserver-extras
deleted file mode 100644
index 34936c7..0000000
--- a/x2goserver-extras/VERSION.x2goserver-extras
+++ /dev/null
@@ -1 +0,0 @@
-3.0.99.5
\ No newline at end of file
diff --git a/x2goserver-extras/bin/x2gosetkeyboard b/x2goserver-extras/bin/x2gosetkeyboard
deleted file mode 100755
index 022f97d..0000000
--- a/x2goserver-extras/bin/x2gosetkeyboard
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
-# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de>
-
-set -e
-
-# set up paths
-X2GO_SESSION_ROOT=${HOME}/.x2go
-X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION}
-
-# client keyboard configuration
-X2GO_CLIENT_KBD_FILE=${X2GO_SESSION_DIR}/keyboard
-
-test -f ${X2GO_CLIENT_KBD_FILE} || exit 0
-
-read_keyboard_file() {
-
- # retrieve keyboard settings from keyboard file in X2go session dir
- XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-
-}
-
-update_keymap() {
-
- # prepare for setxkbmap call
- [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES"
- [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL"
- [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT"
- [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT"
- [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS"
-
- # update keyboard map
- setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS
-}
-
-### main ###
-read_keyboard_file
-update_keymap
diff --git a/x2goserver-extras/bin/x2goversion b/x2goserver-extras/bin/x2goversion
deleted file mode 100755
index 64dd758..0000000
--- a/x2goserver-extras/bin/x2goversion
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
-# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de>
-
-X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions"
-
-get_version() {
- cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1
-}
-
-if [ -n "$1" ]; then
- X2GO_COMPONENT="$1"
- X2GO_COMPONENT_VERFILE="${X2GO_VERSIONS_BASEPATH}/VERSION.${X2GO_COMPONENT}"
-
- if [ -f "${X2GO_COMPONENT_VERFILE}" ]; then
- echo "$(get_version ${X2GO_COMPONENT_VERFILE})"
- else
- echo "Version information for X2go component '$X2GO_COMPONENT' is not available." >&1
- fi
-else
- cd ${X2GO_VERSIONS_BASEPATH}
- for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do
- X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)"
- X2GO_COMPONENT_VERSION="$(get_version $compfile)"
- echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}"
- done
- cd - >/dev/null
-fi
-
diff --git a/x2goserver-extras/man/man8/x2gosetkeyboard.8 b/x2goserver-extras/man/man8/x2gosetkeyboard.8
deleted file mode 100644
index 7c26b33..0000000
--- a/x2goserver-extras/man/man8/x2gosetkeyboard.8
+++ /dev/null
@@ -1,29 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH x2gosetkeyboard 8 "30 May 2011" "Version 3.0.99.x" "X2go Server Tool"
-.SH NAME
-x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBx2gosetkeyboard\fR
-
-.SH DESCRIPTION
-\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects
-the X2go session keyboard settings requested from the client side.
-.PP
-If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
-will be raised).
-.PP
-.SH FILES
-${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
-.PP
-.SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project
-(http://www.x2go.org).
diff --git a/x2goserver-extras/man/man8/x2goversion.8 b/x2goserver-extras/man/man8/x2goversion.8
deleted file mode 100644
index 6552f1b..0000000
--- a/x2goserver-extras/man/man8/x2goversion.8
+++ /dev/null
@@ -1,35 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH x2goversion 8 "29 May 2011" "Version 3.0.99.x" "X2go Server Tool"
-.SH NAME
-x2goversion \- Retrieve Code Versions of X2go Server Components
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBx2goversion [<x2go-component>]\fR
-
-.SH DESCRIPTION
-\fBx2goversion\fR allows to retrieve code versions of X2go server components.
-.PP
-If the
-\fB[<x2go-component>]\fR parameter is omitted then a list of all available X2go server
-component names and versions is listed.
-.PP
-If an X2go component is specified with the \fB[<x2go-component>]\fR parameter, then only the
-component's version is printed to stdout.
-.PP
-The \fBx2goversion\fR tool can be used by X2go client implementations to query server-side versions
-of X2go components.
-.PP
-.SH FILES
-/usr/share/x2go/versions/VERSION.*
-.PP
-.SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project
-(http://www.x2go.org).
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).
[View Less]
The branch, build-baikal has been updated
via d64013f1b0ac2d5de341b5acddb29223a1e98e6d (commit)
from 9cdeea70167490c2257fc905a7b2364aa4a58e2f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/…
[View More]changelog | 4 ++--
.../html/man8/x2gocleansessions.8.html | 2 +-
.../html/man8/x2golistsessions.8.html | 2 +-
.../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +-
.../.build_man2html/html/man8/x2goprint.8.html | 2 +-
.../html/man8/x2goresume-session.8.html | 2 +-
.../html/man8/x2goruncommand.8.html | 2 +-
.../html/man8/x2gostartagent.8.html | 2 +-
.../html/man8/x2gosuspend-session.8.html | 2 +-
.../html/man8/x2goterminate-session.8.html | 2 +-
.../html/man8/x2goumount-session.8.html | 2 +-
.../.build_man2html/html/man8/x2goumount.8.html | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a805fc0..68c8940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
* splitting up x2goserver package into x2goserver and x2goserver-extensions
(x2goserver provides full functionality to legacy x2goclient,
- x2goserver-extensions is a container/namespace for add-on tools/scripts needed
- for other client implementations like Python X2go.
+ x2goserver-extensions is a container/namespace for add-on tools/scripts
+ needed for other client implementations like Python X2go.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 31 May 2011 10:57:15 +0200
diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
index 8ff44bd..5fa85bd 100644
--- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
index 34341c8..b91d5b3 100644
--- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
index e7a53ab..81e8d63 100644
--- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
index 28eb6d7..d71bba5 100644
--- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
index 43a0d65..7ac8a17 100644
--- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
index 66d82d1..8a6506e 100644
--- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
index 44edba2..38b5340 100644
--- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
index 339da68..9e1308e 100644
--- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
index d4ed55e..3f7bb19 100644
--- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
index da29c42..1940b50 100644
--- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount.8.html b/x2goserver/.build_man2html/html/man8/x2goumount.8.html
index 1a8797e..7c6b79d 100644
--- a/x2goserver/.build_man2html/html/man8/x2goumount.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goumount.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
+Time: 10:13:24 GMT, May 31, 2011
</BODY>
</HTML>
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).
[View Less]