[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-266-g9acba84
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:51:54 CET 2014
The branch, build-baikal has been updated
via 9acba84e5041b2acf715bb221184d674b63c5ecb (commit)
from f42f18407a1f578cda599cce2810028b7eabebd1 (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/changelog | 2 +
debian/control | 90 ++-----
debian/libx2go-server-perl.install | 5 +-
debian/x2goserver-compat.docs | 1 -
debian/x2goserver-compat.install | 2 -
debian/x2goserver-compat.manpages | 1 -
debian/x2goserver-pyhoca.dirs | 3 -
debian/x2goserver-pyhoca.docs | 1 -
debian/x2goserver-pyhoca.install | 3 -
debian/x2goserver-pyhoca.manpages | 1 -
x2goserver-compat/Makefile | 87 -------
x2goserver-compat/README.md | 16 --
x2goserver-compat/VERSION.x2goserver-compat | 1 -
x2goserver-compat/bin/x2gosuspend | 24 --
x2goserver-compat/bin/x2gosuspend-agent | 30 ---
x2goserver-compat/bin/x2goterminate | 30 ---
x2goserver-compat/man/man8/x2gosuspend-agent.8 | 23 --
x2goserver-compat/man/man8/x2gosuspend.8 | 23 --
x2goserver-compat/man/man8/x2goterminate.8 | 23 --
.../share/x2gofeature.d/x2goserver-compat.features | 36 ---
x2goserver-pyhoca/Makefile | 70 -----
x2goserver-pyhoca/README.md | 14 -
x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 1 -
.../share/x2gofeature.d/x2goserver-pyhoca.features | 35 ---
x2goserver.spec | 271 +++++++++++++++++---
25 files changed, 269 insertions(+), 524 deletions(-)
delete mode 100644 debian/x2goserver-compat.docs
delete mode 100644 debian/x2goserver-compat.install
delete mode 100644 debian/x2goserver-compat.manpages
delete mode 100644 debian/x2goserver-pyhoca.dirs
delete mode 100644 debian/x2goserver-pyhoca.docs
delete mode 100644 debian/x2goserver-pyhoca.install
delete mode 100644 debian/x2goserver-pyhoca.manpages
delete mode 100755 x2goserver-compat/Makefile
delete mode 100644 x2goserver-compat/README.md
delete mode 100644 x2goserver-compat/VERSION.x2goserver-compat
delete mode 100755 x2goserver-compat/bin/x2gosuspend
delete mode 100755 x2goserver-compat/bin/x2gosuspend-agent
delete mode 100755 x2goserver-compat/bin/x2goterminate
delete mode 100644 x2goserver-compat/man/man8/x2gosuspend-agent.8
delete mode 100644 x2goserver-compat/man/man8/x2gosuspend.8
delete mode 100644 x2goserver-compat/man/man8/x2goterminate.8
delete mode 100755 x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
delete mode 100755 x2goserver-pyhoca/Makefile
delete mode 100644 x2goserver-pyhoca/README.md
delete mode 100644 x2goserver-pyhoca/VERSION.x2goserver-pyhoca
delete mode 100644 x2goserver-pyhoca/bin/.placeholder
delete mode 100644 x2goserver-pyhoca/man/man8/.placeholder
delete mode 100755 x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a337463..e5e69a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
+ Rely on $PATH when invoking x2gocleansessions.
* Move code in pre/post+inst/rm scripts around (from x2goserver package
to libx2go-server-db-perl and x2goserver-common).
+ * x2goclient.spec:
+ + Bring debian/control and x2goclient.spec in sync.
[ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
* New upstream version (4.1.0.0):
diff --git a/debian/control b/debian/control
index f634227..9d3aa80 100644
--- a/debian/control
+++ b/debian/control
@@ -46,17 +46,19 @@ Recommends:
x2goserver-printing (>= ${source:Version}), x2goserver-printing (<< ${source:Version}.1~),
xfonts-base,
Suggests:
- x2goserver-compat (>= ${source:Version}), x2goserver-compat (<< ${source:Version}.1~),
- x2goserver-pyhoca (>= ${source:Version}), x2goserver-pyhoca (<< ${source:Version}.1~),
rdesktop,
pulseaudio-utils
Breaks:
x2goserver-one,
x2goserver-home,
+ x2goserver-compat,
+ x2goserver-pyhoca,
Replaces:
x2goserver-one,
x2goserver-home,
-Description: X2Go server daemon scripts
+ x2goserver-compat,
+ x2goserver-pyhoca,
+Description: X2Go server
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -67,15 +69,6 @@ Description: X2Go server daemon scripts
.
This package contains the main daemon and tools for
X2Go server-side session administrations.
- .
- 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-common
Architecture: any
@@ -176,7 +169,7 @@ Replaces:
x2goprint
Suggests:
cups-x2go
-Description: X2Go server daemon scripts (printing)
+Description: X2Go server (printing support)
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -185,43 +178,26 @@ Description: X2Go server daemon scripts (printing)
- audio support
- authentication by smartcard and USB stick
.
- The X2Go server printing package provides
+ The X2Go Server printing package provides
client-side printing support for X2Go.
.
- This package has to be installed on X2Go servers
+ This package has to be installed on X2Go Servers
that shall be able to pass X2Go print jobs on
to the X2Go client.
.
This package co-operates with the cups-x2go CUPS
- backend. If CUPS server and X2Go server are hosted
+ backend. If CUPS server and X2Go Server are hosted
on different machines, then make sure you install
- this package on the X2Go server/s (and the cups-x2go
+ this package on the X2Go Server/s (and the cups-x2go
package on the CUPS server).
-Package: x2goserver-compat
-Architecture: all
-Depends:
- ${misc:Depends},
- x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~)
-Description: X2Go server daemon scripts (backwards compatitbity to old client versions)
- X2Go is a server based computing environment with
- - session resuming
- - low bandwidth support
- - session brokerage support
- - client side mass storage mounting support
- - audio support
- - authentication by smartcard and USB stick
- .
- This package contains compatitbility scripts to allow
- old x2goclient versions to connect to your X2Go server.
-
Package: x2goserver-extensions
Architecture: all
Depends:
${misc:Depends},
x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
x11-xkb-utils
-Description: X2Go server daemon scripts (extensions)
+Description: X2Go Server (extension support)
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -230,13 +206,12 @@ Description: X2Go server daemon scripts (extensions)
- audio support
- authentication by smartcard and USB stick
.
- The X2Go server extension namespace offers contributors
- to add script functionality to X2Go that is not
- needed/ignored by the legacy X2Go client (x2goclient).
+ The X2Go Server extension namespace offers contributors
+ to add script functionality to X2Go.
.
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.
+ if you want X2Go clients to be able to access your server
+ without lack of features.
Package: x2goserver-xsession
Architecture: all
@@ -244,7 +219,7 @@ Depends:
${misc:Depends},
x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
x11-common
-Description: X2Go server daemon scripts (Xsession runner)
+Description: X2Go Server (Xsession runner)
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -253,7 +228,7 @@ Description: X2Go server daemon scripts (Xsession runner)
- audio support
- authentication by smartcard and USB stick
.
- This X2Go server add-on enables Xsession script handling
+ This X2Go Server add-on enables Xsession script handling
when starting desktop sessions with X2Go.
.
Amongst others the parsing of Xsession scripts will
@@ -268,7 +243,7 @@ Depends:
x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
desktop-file-utils,
xdg-utils
-Description: Generic (freedesktop-based) file manager bindings for X2Go
+Description: X2Go Server (file manager bindings)
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -277,7 +252,7 @@ Description: Generic (freedesktop-based) file manager bindings for X2Go
- audio support
- authentication by smartcard and USB stick
.
- x2goserver-fmbindings contains generic MIME type information
+ This package contains generic MIME type information
for X2Go's local folder sharing. It can be used with all
freedesktop.org compliant desktop shells.
.
@@ -285,29 +260,6 @@ Description: Generic (freedesktop-based) file manager bindings for X2Go
destkop binding components, if installed and being used with the
corresponding desktop shell:
- under LXDE by x2golxdebindings
- - under GNOME by x2gognomebindings
+ - under GNOMEv2 by x2gognomebindings
- under KDE4 by plasma-widget-x2go
-
-Package: x2goserver-pyhoca
-Architecture: all
-Depends:
- ${misc:Depends},
- x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
-Description: X2Go server daemon scripts (add-ons for pyhoca client)
- X2Go is a server based computing environment with
- - session resuming
- - low bandwidth support
- - session brokerage support
- - client side mass storage mounting support
- - audio support
- - authentication by smartcard and USB stick
- .
- This X2Go server add-on adds extra functionality when using
- the pyhoca client (GUI or cmdline tool). The installation
- of this package is completely optional, the pyhoca client
- will work without.
- .
- Functionalities this package adds:
- - renaming of session window titles
- - setting detailled X keyboard parameters
-
+ - under MATE by x2gomatebindings
diff --git a/debian/libx2go-server-perl.install b/debian/libx2go-server-perl.install
index 9b839db..e5eb159 100644
--- a/debian/libx2go-server-perl.install
+++ b/debian/libx2go-server-perl.install
@@ -2,4 +2,7 @@ usr/share/perl5/X2Go/Config.pm
usr/share/perl5/X2Go/Server.pm
usr/share/perl5/X2Go/SupeReNicer.pm
usr/share/perl5/X2Go/Utils.pm
-usr/share/man/man3/X2Go::Server.*
\ No newline at end of file
+usr/share/man/man3/X2Go::Config.*
+usr/share/man/man3/X2Go::Server.*
+usr/share/man/man3/X2Go::SuperReNicer.*
+usr/share/man/man3/X2Go::Utils.*
diff --git a/debian/x2goserver-compat.docs b/debian/x2goserver-compat.docs
deleted file mode 100644
index 121edd8..0000000
--- a/debian/x2goserver-compat.docs
+++ /dev/null
@@ -1 +0,0 @@
-x2goserver-compat/.build_man2html/html
diff --git a/debian/x2goserver-compat.install b/debian/x2goserver-compat.install
deleted file mode 100644
index 5059ee2..0000000
--- a/debian/x2goserver-compat.install
+++ /dev/null
@@ -1,2 +0,0 @@
-x2goserver-compat/bin/x2go* /usr/bin/
-x2goserver-compat/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/
diff --git a/debian/x2goserver-compat.manpages b/debian/x2goserver-compat.manpages
deleted file mode 100644
index dc59c8c..0000000
--- a/debian/x2goserver-compat.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2goserver-compat/man/man8/*
\ No newline at end of file
diff --git a/debian/x2goserver-pyhoca.dirs b/debian/x2goserver-pyhoca.dirs
deleted file mode 100644
index 45adc59..0000000
--- a/debian/x2goserver-pyhoca.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/x2go
-usr/share/x2go/versions
diff --git a/debian/x2goserver-pyhoca.docs b/debian/x2goserver-pyhoca.docs
deleted file mode 100644
index 3a19506..0000000
--- a/debian/x2goserver-pyhoca.docs
+++ /dev/null
@@ -1 +0,0 @@
-#x2goserver-pyhoca/.build_man2html/html
diff --git a/debian/x2goserver-pyhoca.install b/debian/x2goserver-pyhoca.install
deleted file mode 100644
index 69985ca..0000000
--- a/debian/x2goserver-pyhoca.install
+++ /dev/null
@@ -1,3 +0,0 @@
-#x2goserver-pyhoca/bin/x2go* /usr/bin/
-x2goserver-pyhoca/VERSION.x2goserver-pyhoca /usr/share/x2go/versions/
-#x2goserver-pyhoca/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/
diff --git a/debian/x2goserver-pyhoca.manpages b/debian/x2goserver-pyhoca.manpages
deleted file mode 100644
index 6f35882..0000000
--- a/debian/x2goserver-pyhoca.manpages
+++ /dev/null
@@ -1 +0,0 @@
-#x2goserver-pyhoca/man/man8/*
\ No newline at end of file
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
deleted file mode 100755
index b2cb141..0000000
--- a/x2goserver-compat/Makefile
+++ /dev/null
@@ -1,87 +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 && echo *)
-#SBIN_SCRIPTS=$(shell cd sbin && echo *)
-#LIB_FILES=$(shell cd lib && echo *)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
-
-man_pages = `cd man && find * -type f`
-
-MAN2HTML_BIN = man2html
-MAN2HTML_SRC = man
-MAN2HTML_DEST = .build_man2html/html
-
-all: clean build
-
-build: build-arch build-indep
-
-build-arch:
-
-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) $(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)$(SHAREDIR)
- $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
- $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
-
-install_config:
-
-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-compat $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
-
-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 $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
-
-uninstall_config:
-
-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) || true
-
-uninstall_version:
- $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
- $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-compat/README.md b/x2goserver-compat/README.md
deleted file mode 100644
index 114c247..0000000
--- a/x2goserver-compat/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# x2goserver-compat
-This folder contains backwards compatibility stuff and sources that that are used by old clients. Have a look into each subfolder, they're pretty outdated.
-
- * bin
-
- contains the old scripts for suspending and agend-suspending as well as the terminate script.
-
- * man
-
- man page documenations
-
- * share
-
- x2gofeature.d folder, also for backwards compatibility.
-
-
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
deleted file mode 100644
index 1667ae5..0000000
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ /dev/null
@@ -1 +0,0 @@
-4.1.0.0-preview
\ No newline at end of file
diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend
deleted file mode 100755
index 0408a67..0000000
--- a/x2goserver-compat/bin/x2gosuspend
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2013 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-2013 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-# this script is here for reasons of backwards compatibility with older clients
-x2gosuspend-session $@
\ No newline at end of file
diff --git a/x2goserver-compat/bin/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent
deleted file mode 100755
index 8090c64..0000000
--- a/x2goserver-compat/bin/x2gosuspend-agent
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007-2013 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-2013 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-shift;
-shift;
-shift;
-
-my $capt=shift;
-my @words=split(" ",$capt);
-
-system("/usr/bin/x2gosuspend-session @words[2] > /dev/null");
\ No newline at end of file
diff --git a/x2goserver-compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate
deleted file mode 100755
index ca76052..0000000
--- a/x2goserver-compat/bin/x2goterminate
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007-2013 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-2013 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-use strict;
-my $proc=shift;
-
-my @outp=split(",","$proc");
-for(my $i=0;$i<@outp;$i++)
-{
- system("kill @outp[$i]");
-}
diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8
deleted file mode 100644
index e49e430..0000000
--- a/x2goserver-compat/man/man8/x2gosuspend-agent.8
+++ /dev/null
@@ -1,23 +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 x2gosuspend-agent 8 "Jan 2013" "Version 4.1.x.y" "X2Go Server Tool (compat)"
-.SH NAME
-x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-x2gosuspend-agent <session-name>
-
-.SH DESCRIPTION
-\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script
-is required to allow session suspending for 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/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8
deleted file mode 100644
index 71b74d1..0000000
--- a/x2goserver-compat/man/man8/x2gosuspend.8
+++ /dev/null
@@ -1,23 +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 x2gosuspend 8 "Jan 2013" "Version 4.1.x.y" "X2Go Server Tool (compat)"
-.SH NAME
-x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-x2gosuspend <session-name>
-
-.SH DESCRIPTION
-\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script
-is required to allow session suspending for 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/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8
deleted file mode 100644
index d52372f..0000000
--- a/x2goserver-compat/man/man8/x2goterminate.8
+++ /dev/null
@@ -1,23 +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 x2goterminate 8 "Jan 2013" "Version 4.1.x.y" "X2Go Server Tool (compat)"
-.SH NAME
-x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-x2goterminate <session-name>
-
-.SH DESCRIPTION
-\fBx2goterminate\fR is a deprecated script belonging to X2Go Server. The availability of this script
-is required to allow session termination from 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/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
deleted file mode 100755
index 8d023ae..0000000
--- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2013 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-2013 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-X2GO_LIB_PATH="$(x2gopath libexec)";
-
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-X2GO_FEATURE=$1
-
-# check for X2Go server core features
-case "$X2GO_FEATURE" in
-
- "X2GO_COMPAT_SCRIPTS") echo "ok"; exit 0;;
- *) exit -1;;
-
-esac
-
diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile
deleted file mode 100755
index d168617..0000000
--- a/x2goserver-pyhoca/Makefile
+++ /dev/null
@@ -1,70 +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 && echo *)
-#SBIN_SCRIPTS=$(shell cd sbin && echo *)
-#LIB_FILES=$(shell cd lib && echo *)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
-
-#man_pages = `cd man && find * -type f`
-
-#MAN2HTML_BIN = man2html
-#MAN2HTML_SRC = man
-#MAN2HTML_DEST = .build_man2html/html
-
-all: clean build
-
-build: build-arch build-indep
-
-build-arch:
-
-build-indep: build_man2html
-
-build_man2html:
-
-clean: clean_man2html
-
-clean_man2html:
-
-install: install_scripts install_config install_man install_version
-
-install_scripts:
-
-install_config:
-
-install_man:
-
-install_version:
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
- $(INSTALL_FILE) VERSION.x2goserver-pyhoca $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca
-
-uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
-
-uninstall_scripts:
-
-uninstall_config:
-
-uninstall_man:
-
-uninstall_version:
- $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca
- $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-pyhoca/README.md b/x2goserver-pyhoca/README.md
deleted file mode 100644
index d467d2e..0000000
--- a/x2goserver-pyhoca/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# x2goserver-pyhoca
-This folder contains the neccessary placeholder and feature definitions to execute the pyhoca client side.
-
- * bin
-
- placeholder folder
-
- * man
-
- man page documentations
-
- * share
-
- feature definition itself, seems empty so far, maybe only to use the feature installation process?
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
deleted file mode 100644
index 1667ae5..0000000
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ /dev/null
@@ -1 +0,0 @@
-4.1.0.0-preview
\ No newline at end of file
diff --git a/x2goserver-pyhoca/bin/.placeholder b/x2goserver-pyhoca/bin/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/x2goserver-pyhoca/man/man8/.placeholder b/x2goserver-pyhoca/man/man8/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
deleted file mode 100755
index f0020eb..0000000
--- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2013 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-2013 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-X2GO_LIB_PATH="$(x2gopath libexec)";
-
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-X2GO_FEATURE=$1
-
-# check for X2Go server core features
-case "$X2GO_FEATURE" in
-
- *) exit -1;;
-
-esac
-
diff --git a/x2goserver.spec b/x2goserver.spec
index 4e67fa6..42a39b2 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -30,7 +30,6 @@ Requires: net-tools
Requires: openssh-server
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# We need a database
-Requires: perl(DBD::SQLite)
# For killall in x2gosuspend-session
Requires: psmisc
Requires: pwgen
@@ -43,6 +42,10 @@ Requires: x2goagent
Requires: xorg-x11-xinit
Requires: xorg-x11-fonts-misc
Requires(pre): shadow-utils
+Requires: x2goserver-extensions
+#Recommends: x2goserver-xsession
+#Recommands: x2goserver-fmbindings
+#Recommends: x2goserver-printing
%{?perl_default_filter}
@@ -59,15 +62,92 @@ This package contains the main daemon and tools for X2Go server-side session
administrations.
+%package common
+Summary: X2Go Server (common files)
+
+%description common
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+This package contains common files needed by the X2Go Server
+and the X2Go::Server Perl API.
+
+
+%package perl-X2Go-Server
+Summary: Perl X2Go::Server package
+Requires: x2goserver-common = %{version}-%{release}
+Requires: perl-X2Go-Log = %{version}-%{release}
+Requires: perl-X2Go-Server-DB = %{version}-%{release}
+
+%description perl-X2Go-Server
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+This package contains the X2Go::Server Perl package.
+
+
+%package perl-X2Go-Server-DB
+Summary: Perl X2Go::Server::DB package
+Requires: x2goserver-common = %{version}-%{release}
+Requires: perl-X2Go-Log = %{version}-%{release}
+Requires: perl(DBD::SQLite)
+Requires: perl(DBD::Pg)
+
+%description perl-X2Go-Server-DB
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+This package contains the X2Go::Server::DB Perl package.
+
+
+%package perl-X2Go-Log
+Summary: Perl X2Go::Log package
+Requires: x2goserver-common = %{version}-%{release}
+
+%description perl-X2Go-Log
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+This package contains the X2Go::Log Perl package.
+
+
%package printing
-Summary: X2Go server printing support
+Summary: X2Go Server (printing support)
Requires: %{name} = %{version}-%{release}
%description printing
-The X2Go server printing package provides client-side printing support for
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+The X2Go Server printing package provides client-side printing support for
X2Go.
-This package has to be installed on X2Go servers that shall be able to pass
+This package has to be installed on X2Go Servers that shall be able to pass
X2Go print jobs on to the X2Go client.
This package co-operates with the cups-x2go CUPS backend. If CUPS server and
@@ -76,6 +156,77 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS
server).
+%package extensions
+Summary: X2Go Server (extension support)
+Requires: %{name} = %{version}-%{release}
+
+%description extensions
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+The X2Go Server extension namespace offers contributors
+to add script functionality to X2Go.
+
+Make sure you have this package installed on your server
+if you want X2Go clients to be able to access your server
+without lack of features.
+
+
+%package xsession
+Summary: X2Go Server (Xsession runner)
+Requires: %{name} = %{version}-%{release}
+Requires: xorg-x11-xinit
+
+%description xsession
+ X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+ .
+ This X2Go Server add-on enables Xsession script handling
+ when starting desktop sessions with X2Go.
+ .
+ Amongst others the parsing of Xsession scripts will
+ enable desktop-profiles, ssh-agent startups, gpgagent
+ startups and many more Xsession related features on
+ X2Go session login automagically.
+
+%package fmbindings
+Summary: X2Go Server (file manager bindings)
+Requires: %{name} = %{version}-%{release}
+Requires: xdg-utils
+Requires: desktop-file-utils
+
+%description fmbindings
+X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session brokerage support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+
+This package contains generic MIME type information
+for X2Go's local folder sharing. It can be used with all
+freedesktop.org compliant desktop shells.
+
+However, this package can be superseded by other, more specific
+destkop binding components, if installed and being used with the
+corresponding desktop shell:
+ - under LXDE by x2golxdebindings
+ - under GNOMEv2 by x2gognomebindings
+ - under KDE4 by plasma-widget-x2go
+ - under MATE by x2gomatebindings
+
+
%prep
%setup -q
@@ -122,38 +273,38 @@ mkdir -p %{buildroot}%{_initddir}
install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions
%endif
-%pre
+%pre common
getent group x2gouser >/dev/null || groupadd -r x2gouser
getent passwd x2gouser >/dev/null || \
useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \
-c "x2go" x2gouser
exit 0
-%post
+%post perl-X2Go-Server-DB
# Initialize the session database
[ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] &&
%{_sbindir}/x2godbadmin --createdb || :
%if 0%{?fedora}
-%systemd_post x2gocleansessions.service
+%systemd_post x2goserver.service
%preun
-%systemd_preun x2gocleansessions.service
+%systemd_preun x2goserver.service
%postun
-%systemd_postun x2gocleansessions.service
+%systemd_postun x2goserver.service
%else
-/sbin/chkconfig --add x2gocleansessions
+/sbin/chkconfig --add x2goserver
%postun
if [ "$1" -ge "1" ] ; then
- /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || :
+ /sbin/service x2goserver condrestart >/dev/null 2>&1 || :
fi
%preun
if [ "$1" = 0 ]; then
- /sbin/service x2gocleansessions stop >/dev/null 2>&1
- /sbin/chkconfig --del x2gocleansessions
+ /sbin/service x2goserver stop >/dev/null 2>&1
+ /sbin/chkconfig --del x2goserver
fi
%endif
@@ -168,22 +319,15 @@ exit 0
%files
%doc debian/copyright
%doc debian/changelog
-%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
%dir %{_sysconfdir}/x2go/
-%config(noreplace) %{_sysconfdir}/x2go/x*
-%config(noreplace) %{_sysconfdir}/x2go/Xsession.options
-%{_sysconfdir}/x2go/Xresources
-%{_sysconfdir}/x2go/Xsession
-%{_sysconfdir}/x2go/Xsession.d
+%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
%{_bindir}/x2go*
+%exclude %{_bindir}/x2goserver-run-extensions
+%exclude %{_bindir}/x2gofm
%exclude %{_bindir}/x2goprint
%dir %{_libdir}/x2go
-%{_libdir}/x2go/extensions
-%{_libdir}/x2go/x2gosqlitewrapper.pl
-%attr(02755,root,x2gouser) %{_libdir}/x2go/x2gosqlitewrapper
%{_libdir}/x2go/x2gochangestatus
%{_libdir}/x2go/x2gocreatesession
-%{_libdir}/x2go/x2godbwrapper.pm
%{_libdir}/x2go/x2gogetagent
%{_libdir}/x2go/x2gogetdisplays
%{_libdir}/x2go/x2gogetports
@@ -192,30 +336,99 @@ exit 0
%{_libdir}/x2go/x2goinsertsession
%{_libdir}/x2go/x2golistsessions_sql
%{_libdir}/x2go/x2gologlevel
-%{_libdir}/x2go/x2gologlevel.pm
%{_libdir}/x2go/x2goresume
%{_libdir}/x2go/x2gormport
%{_libdir}/x2go/x2gosuspend-agent
%{_libdir}/x2go/x2gosyslog
%{_sbindir}/x2go*
%{_mandir}/man8/x2go*.8.gz
+%exclude %{_mandir}/man8/x2goserver-run-extensions.8.gz
+%exclude %{_mandir}/man8/x2gofm.8.gz
%exclude %{_mandir}/man8/x2goprint.8.gz
-%{_datadir}/x2go/
-%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing
+%{_datadir}/x2go/x2gofeature.d/
+%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features
%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
+%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
+%{_datadir}/x2go/versions/VERSION.x2goserver
%attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
%ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
%if 0%{?fedora}
-%{_unitdir}/x2gocleansessions.service
+%{_unitdir}/x2goserver.service
%else
-%{_initddir}/x2gocleansessions
+%{_initddir}/x2goserver
%endif
+
+%files perl-X2Go-Log
+%{_libdir}/perl5/X2Go/Log.pm
+%{_mandir}/man3/X2Go::Log.*
+
+
+%files perl-X2Go-Server
+%dir %{_libdir}/perl5/X2Go
+%{_libdir}/perl5/X2Go/Config.pm
+%{_libdir}/perl5/X2Go/Server.pm
+%{_libdir}/perl5/X2Go/SupeReNicer.pm
+%{_libdir}/perl5/X2Go/Utils.pm
+%{_mandir}/man3/X2Go::Config.*
+%{_mandir}/man3/X2Go::Server.*
+%{_mandir}/man3/X2Go::SupeReNicer.*
+%{_mandir}/man3/X2Go::Utils.*
+
+
+%files perl-X2Go-Server-DB
+%dir %{_libdir}/perl5/X2Go/DB
+%dir %{_libdir}/x2go
+%{_libdir}/perl5/X2Go/DB/*
+%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper
+%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl
+%{_mandir}/man3/X2Go::Server::DB.*
+%{_mandir}/man3/X2Go::Server::DB::*
+%dir %{_sysconfdir}/x2go/x2gosql
+%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql
+
+
+%files common
+%dir %{_sysconfdir}/x2go/
+%config(noreplace) %{_sysconfdir}/x2go/x2go*
+%{_mandir}/man5/x2goserver.conf.5.gz
+%dir %{_datadir}/x2go/versions
+%{_datadir}/x2go/versions/VERSION.x2goserver-common
+
+
+%files extensions
+%dir %{_libdir}/x2go/extensions
+%{_libdir}/x2go/extensions
+%{_bindir}/x2goserver-run-extensions
+%dir %{_datadir}/x2go/x2gofeature.d
+%{_datadir}/x2go/x2gofeature.d/
+%{_datadir}/x2go/versions/VERSION.x2goserver-extensions
+%{_mandir}/man8/x2goserver-run-extensions.8.gz
+
+
+%files fmbindings
+%{_datadir}/x2go/versions/VERSION.x2goserver-extensions
+%{_bindir}/x2gofm
+%{_datadir}/applications/
+%{_datadir}/mime/
+%{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features
+%{_mandir}/man8/x2gofm.8.gz
+
+
%files printing
%{_bindir}/x2goprint
-%{_mandir}/man8/x2goprint.8.gz
%{_datadir}/x2go/versions/VERSION.x2goserver-printing
%{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
%attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
+%{_mandir}/man8/x2goprint.8.gz
+
+
+%files xsession
+%config(noreplace) %{_sysconfdir}/x2go/Xsession.options
+%{_sysconfdir}/x2go/Xresources
+%config(noreplace) %{_sysconfdir}/x2go/Xsession
+%{_sysconfdir}/x2go/Xsession.d
+%{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
+%{_datadir}/x2go/versions/VERSION.x2goserver-xsession
%changelog
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