[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-43-gf694b1b

X2Go dev team git-admin at x2go.org
Fri Jan 3 18:03:56 CET 2014


The branch, build-baikal has been updated
       via  f694b1b0ec434427ae98c4bc5bde30de6242d6b9 (commit)
      from  10090a8827390851fe4c5e6e783ec9ba3c29ee32 (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                               |   10 ++++++++-
 VERSION.x2goserver                     |    1 +
 bin/x2goversion                        |   27 ++++++++++++++++++++++++
 debian/x2goserver.dirs                 |    2 ++
 debian/x2goserver.install              |    1 +
 debian/x2goserver.manpages             |    1 +
 man/man8/x2goversion.8                 |   35 ++++++++++++++++++++++++++++++++
 share/x2go/versions/VERSION.x2goserver |    1 +
 8 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 VERSION.x2goserver
 create mode 100755 bin/x2goversion
 create mode 100644 debian/x2goserver.manpages
 create mode 100644 man/man8/x2goversion.8
 create mode 120000 share/x2go/versions/VERSION.x2goserver

The diff of changes is:
diff --git a/Makefile b/Makefile
index 9387cfb..a9239a7 100755
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ ETCDIR=/etc/x2go
 BINDIR=$(PREFIX)/bin
 SBINDIR=$(PREFIX)/sbin
 LIBDIR=$(PREFIX)/lib/x2go
+SHAREDIR=$(PREFIX)/share/x2go
 
 BIN_SCRIPTS=$(shell cd bin && ls)
 SBIN_SCRIPTS=$(shell cd sbin && ls)
@@ -30,13 +31,16 @@ install:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
 	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
 	$(INSTALL_PROGRAM) sbin/*               $(DESTDIR)$(SBINDIR)/
 	$(INSTALL_FILE) lib/*                   $(DESTDIR)$(LIBDIR)/
 	$(INSTALL_FILE) etc/x2goserver.conf     $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/x2gosql/sql         $(DESTDIR)$(ETCDIR)/x2gosql
+	$(INSTALL_FILE) VERSION                 $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
 
-uninstall: uninstall_scripts uninstall_config
+uninstall: uninstall_scripts uninstall_config uninstall_version
 
 uninstall_scripts:
 	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
@@ -50,3 +54,7 @@ uninstall_config:
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR)
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql/passwords
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql
+
+uninstall_version:
+	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
+	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/versions
diff --git a/VERSION.x2goserver b/VERSION.x2goserver
new file mode 100644
index 0000000..34936c7
--- /dev/null
+++ b/VERSION.x2goserver
@@ -0,0 +1 @@
+3.0.99.5
\ No newline at end of file
diff --git a/bin/x2goversion b/bin/x2goversion
new file mode 100755
index 0000000..e98e8ce
--- /dev/null
+++ b/bin/x2goversion
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+X2GO_VERSIONS_BASEPATH="../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`; do 
+		X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)"
+		X2GO_COMPONENT_VERSION="$(get_version $compfile)"
+		echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}"
+	done
+	cd -
+fi
+
diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs
index b8b06fa..c51bc7c 100644
--- a/debian/x2goserver.dirs
+++ b/debian/x2goserver.dirs
@@ -1,4 +1,6 @@
 etc/x2go
 etc/x2go/x2gosql
 etc/x2go/x2gosql/passwords
+usr/share/x2go
+usr/share/x2go/versions
 var/lib/x2go
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index e308da5..78b0580 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -3,3 +3,4 @@ sbin/x2go*     /usr/sbin/
 etc/x2gosql/sql         /etc/x2go/x2gosql/
 etc/x2goserver.conf     /etc/x2go/
 lib/x2godbwrapper.pm    /usr/lib/x2go/
+VERSION.x2goserver      /usr/share/x2go/versions/
\ No newline at end of file
diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages
new file mode 100644
index 0000000..b170884
--- /dev/null
+++ b/debian/x2goserver.manpages
@@ -0,0 +1 @@
+man/man8/*
\ No newline at end of file
diff --git a/man/man8/x2goversion.8 b/man/man8/x2goversion.8
new file mode 100644
index 0000000..6552f1b
--- /dev/null
+++ b/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 "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 at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/share/x2go/versions/VERSION.x2goserver b/share/x2go/versions/VERSION.x2goserver
new file mode 120000
index 0000000..d62dc73
--- /dev/null
+++ b/share/x2go/versions/VERSION.x2goserver
@@ -0,0 +1 @@
+../../../VERSION
\ 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