The branch, build-main has been updated discards 5a4f129a152362b5bfb133d39638274ed0c65f41 (commit) via 19582aa37e0e3cab202c43cd7497d791cbeee1b3 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (5a4f129a152362b5bfb133d39638274ed0c65f41) \ N -- N -- N (19582aa37e0e3cab202c43cd7497d791cbeee1b3) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 | 3 +- debian/control | 89 +++++++++++++++++++++++++----------------------- debian/rules | 8 ++--- etc/x2gobroker.conf | 3 ++ sbin/x2gobroker | 1 + x2gobroker/defaults.py | 1 + 6 files changed, 57 insertions(+), 48 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 52d3774..b460d0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.1.0): + - Continue development... -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100 diff --git a/debian/control b/debian/control index 545adac..eb7187c 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: x2gobroker -Section: misc +Section: python Priority: optional Maintainer: X2Go Developers <x2go-dev@lists.berlios.de> Uploaders: @@ -13,46 +13,15 @@ Build-Depends: python-setuptools, python-nose, python-paste, -Standards-Version: 3.9.4 - -Package: python-x2gobroker -Section: python -Architecture: all -Depends: - ${python:Depends}, - ${misc:Depends}, - python-pampy, - python-netaddr, - python-tornado, - python-paramiko, -Description: X2Go http(s) based session broker (Python modules) - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - LDAP support - - client side mass storage mounting support - - client side printing support - - audio support - - authentication by smartcard and USB stick - . - The session broker is a server tool for X2Go that - tells your X2Go Client application in a terminal - server cluster what servers and session types are - most appropriate for the user in front of the - X2Go terminal. - . - A session broker is most useful in load balanced - X2Go server farms. - . - This package contains common files needed by all X2Go session - brokers being package for this distribution. -XS-Python-Version: >= 2.6 +Standards-Version: 3.9.3 +XS-Python-Version: >= 2.4 Package: x2gobroker Architecture: all Depends: - ${python:Depends}, ${misc:Depends}, + ${python:Depends}, + python, python-argparse, python-setproctitle, python-tornado, @@ -83,12 +52,13 @@ Description: X2Go http(s) based session broker (executable) Package: x2gobroker-authservice Architecture: all Depends: - ${python:Depends}, - ${misc:Depends}, + python, python-argparse, python-setproctitle, + ${misc:Depends}, + ${python:Depends}, Suggests: - x2gobroker-daemon, + apache2 | httpd, Description: X2Go http(s) based session broker (PAM authentication service) X2Go is a server based computing environment with - session resuming @@ -115,10 +85,13 @@ Package: x2gobroker-daemon Architecture: all Depends: ${misc:Depends}, + ${python:Depends}, adduser, x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), Recommends: x2gobroker-authservice, +Suggests: + apache2 | httpd, Description: X2Go http(s) based session broker (daemon) X2Go is a server based computing environment with - session resuming @@ -172,16 +145,46 @@ Description: X2Go http(s) based session broker (daemon) # the X2Go Session Broker as a CGI script so it # can be run from within an existing httpd server. +Package: python-x2gobroker +Architecture: all +Depends: + ${misc:Depends}, + ${python:Depends}, + python-pampy, + python-netaddr, + python-tornado, + python-paramiko, +Suggests: + apache2 | httpd, +Description: X2Go http(s) based session broker (Python modules) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains common files needed by all X2Go session + brokers being package for this distribution. + Package: x2gobroker-agent Architecture: any Depends: ${shlibs:Depends}, - ${python:Depends}, ${misc:Depends}, - python-setproctitle, - python-argparse, - python-paramiko, perl, + python, adduser, x2goserver, Description: X2Go http(s) based session broker (common files) diff --git a/debian/rules b/debian/rules index 5521e3b..28be4dc 100755 --- a/debian/rules +++ b/debian/rules @@ -22,12 +22,12 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall #include /usr/share/dpkg/buildflags.mk -include /usr/share/cdbs/1/rules/debhelper.mk - DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") -DEB_PYTHON_INSTALL_ARGS_python-x2gobroker ?= --root --prefix=$(DEB_PYTHON_PREFIX_ARG) --no-compile -O0 --install-layout=deb -include /usr/share/cdbs/1/class/python-distutils.mk +DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --single-version-externally-managed + +include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/class/python-distutils.mk # needed when building with pysupport (e.g. on Ubuntu lucid) common-binary-indep:: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 24a530f..85eaa77 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -71,6 +71,9 @@ # enable {base_url}/plain/ #enable-plain-output = true +# enable {base_url}/uccs/ +#enable-uccs-output = false + # enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) #enable-json-output = false diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 3951539..05678ab 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -116,6 +116,7 @@ import x2gobroker.web.extras # define the web.py URLs urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), + ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,), # ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), # ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), ('/pubkeys/', x2gobroker.web.extras.X2GoBrokerPubKeyService,), diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index cfc7372..fcbb8ca 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -118,6 +118,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'use-static-cookie': False, u'my-cookie': uuid.uuid4(), u'enable-plain-output': True, + u'enable-uccs-output': False, u'enable-json-output': False, u'enable-html-output': False, u'default-auth-mech': u'pam', hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).