[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-2-g5a4f129

[X2Go dev team]

The branch, build-main has been updated
       via  5a4f129a152362b5bfb133d39638274ed0c65f41 (commit)
      from  4784e541be81a76d8e92ed70316dbadf041ecc13 (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/control |   89 +++++++++++++++++++++++++++-----------------------------
 debian/rules   |    8 ++---
 2 files changed, 47 insertions(+), 50 deletions(-)

The diff of changes is:
diff --git a/debian/control b/debian/control
index eb7187c..545adac 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: x2gobroker
-Section: python
+Section: misc
 Priority: optional
 Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
 Uploaders:
@@ -13,15 +13,46 @@ Build-Depends:
  python-setuptools,
  python-nose,
  python-paste,
-Standards-Version: 3.9.3
-XS-Python-Version: >= 2.4
+Standards-Version: 3.9.4
 
-Package: x2gobroker
+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
+
+Package: x2gobroker
+Architecture: all
+Depends:
  ${python:Depends},
- python,
+ ${misc:Depends},
  python-argparse,
  python-setproctitle,
  python-tornado,
@@ -52,13 +83,12 @@ Description: X2Go http(s) based session broker (executable)
 Package: x2gobroker-authservice
 Architecture: all
 Depends:
- python,
+ ${python:Depends},
+ ${misc:Depends},
  python-argparse,
  python-setproctitle,
- ${misc:Depends},
- ${python:Depends},
 Suggests:
- apache2 | httpd,
+ x2gobroker-daemon,
 Description: X2Go http(s) based session broker (PAM authentication service)
  X2Go is a server based computing environment with
     - session resuming
@@ -85,13 +115,10 @@ 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
@@ -145,46 +172,16 @@ 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 28be4dc..5521e3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,12 +22,12 @@
 #export DEB_CFLAGS_MAINT_APPEND = -Wall
 #include /usr/share/dpkg/buildflags.mk
 
-DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport")
-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
+
+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
+include /usr/share/cdbs/1/class/makefile.mk
 
 # needed when building with pysupport (e.g. on Ubuntu lucid)
 common-binary-indep::


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).