[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 3.0.99-2-137-ge2cbf2d
X2Go dev team
git-admin at x2go.org
Thu Jun 6 13:34:37 CEST 2013
The branch, release/4.0.1.x has been updated
via e2cbf2d58b98b53a5c68334de9844740d8f657b5 (commit)
from 04704f9d55ac9f5c900468e183dd1f22c68f49e5 (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/x2goserver-compat.install | 1 +
debian/x2goserver-compat.manpages | 1 +
.../Makefile | 4 ++--
.../compat => x2goserver-compat}/bin/x2gosuspend | 0
.../compat => x2goserver-compat}/bin/x2goterminate | 0
.../compat => x2goserver-compat}/bin/x2goumount | 0
x2goserver-compat/man/man1/x2gosuspend.1 | 23 +++++++++++++++++++
x2goserver-compat/man/man1/x2goterminate.1 | 23 +++++++++++++++++++
x2goserver-compat/man/man1/x2goumount.1 | 23 +++++++++++++++++++
x2goserver/compat/bin/x2goumount_session | 24 --------------------
10 files changed, 73 insertions(+), 26 deletions(-)
create mode 100644 debian/x2goserver-compat.install
create mode 100644 debian/x2goserver-compat.manpages
copy {x2goserver-extensions => x2goserver-compat}/Makefile (94%)
rename {x2goserver/compat => x2goserver-compat}/bin/x2gosuspend (100%)
rename {x2goserver/compat => x2goserver-compat}/bin/x2goterminate (100%)
rename {x2goserver/compat => x2goserver-compat}/bin/x2goumount (100%)
create mode 100644 x2goserver-compat/man/man1/x2gosuspend.1
create mode 100644 x2goserver-compat/man/man1/x2goterminate.1
create mode 100644 x2goserver-compat/man/man1/x2goumount.1
delete mode 100755 x2goserver/compat/bin/x2goumount_session
The diff of changes is:
diff --git a/debian/x2goserver-compat.install b/debian/x2goserver-compat.install
new file mode 100644
index 0000000..b7ce8ba
--- /dev/null
+++ b/debian/x2goserver-compat.install
@@ -0,0 +1 @@
+x2goserver-compat/bin/x2go* /usr/bin/
diff --git a/debian/x2goserver-compat.manpages b/debian/x2goserver-compat.manpages
new file mode 100644
index 0000000..106369b
--- /dev/null
+++ b/debian/x2goserver-compat.manpages
@@ -0,0 +1 @@
+x2goserver-compat/man/man1/*
\ No newline at end of file
diff --git a/x2goserver-extensions/Makefile b/x2goserver-compat/Makefile
similarity index 94%
copy from x2goserver-extensions/Makefile
copy to x2goserver-compat/Makefile
index ae6b3c1..7145f04 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-compat/Makefile
@@ -73,7 +73,7 @@ install_man:
install_version:
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
- $(INSTALL_FILE) VERSION.x2goserver-extensions $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
+ $(INSTALL_FILE) VERSION.x2goserver-compat $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
@@ -96,5 +96,5 @@ uninstall_man:
$(RM_DIR) $(DESTDIR)$(MANDIR)
uninstall_version:
- $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
+ $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
$(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
diff --git a/x2goserver/compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend
similarity index 100%
rename from x2goserver/compat/bin/x2gosuspend
rename to x2goserver-compat/bin/x2gosuspend
diff --git a/x2goserver/compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate
similarity index 100%
rename from x2goserver/compat/bin/x2goterminate
rename to x2goserver-compat/bin/x2goterminate
diff --git a/x2goserver/compat/bin/x2goumount b/x2goserver-compat/bin/x2goumount
similarity index 100%
rename from x2goserver/compat/bin/x2goumount
rename to x2goserver-compat/bin/x2goumount
diff --git a/x2goserver-compat/man/man1/x2gosuspend.1 b/x2goserver-compat/man/man1/x2gosuspend.1
new file mode 100644
index 0000000..3348377
--- /dev/null
+++ b/x2goserver-compat/man/man1/x2gosuspend.1
@@ -0,0 +1,23 @@
+'\" -*- 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 x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.SH NAME
+x2gomount \- X2go Server Script (deprecated, shipped for compatibility)
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+x2gomount (deprecated)
+
+.SH DESCRIPTION
+\fBx2gomount\fR is a deprecated script belonging to X2go Server. The availability of this script
+is required to allow old local folder sharing to old \fBx2goclient\fR versions.
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/x2goserver-compat/man/man1/x2goterminate.1 b/x2goserver-compat/man/man1/x2goterminate.1
new file mode 100644
index 0000000..3348377
--- /dev/null
+++ b/x2goserver-compat/man/man1/x2goterminate.1
@@ -0,0 +1,23 @@
+'\" -*- 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 x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.SH NAME
+x2gomount \- X2go Server Script (deprecated, shipped for compatibility)
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+x2gomount (deprecated)
+
+.SH DESCRIPTION
+\fBx2gomount\fR is a deprecated script belonging to X2go Server. The availability of this script
+is required to allow old local folder sharing to old \fBx2goclient\fR versions.
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/x2goserver-compat/man/man1/x2goumount.1 b/x2goserver-compat/man/man1/x2goumount.1
new file mode 100644
index 0000000..3348377
--- /dev/null
+++ b/x2goserver-compat/man/man1/x2goumount.1
@@ -0,0 +1,23 @@
+'\" -*- 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 x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.SH NAME
+x2gomount \- X2go Server Script (deprecated, shipped for compatibility)
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+x2gomount (deprecated)
+
+.SH DESCRIPTION
+\fBx2gomount\fR is a deprecated script belonging to X2go Server. The availability of this script
+is required to allow old local folder sharing to old \fBx2goclient\fR versions.
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/x2goserver/compat/bin/x2goumount_session b/x2goserver/compat/bin/x2goumount_session
deleted file mode 100755
index 5814b34..0000000
--- a/x2goserver/compat/bin/x2goumount_session
+++ /dev/null
@@ -1,24 +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) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-# this script is here for reasons of backwards compatibility with older clients
-x2goumount-session $@
\ 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).
More information about the x2go-commits
mailing list