[X2Go-Commits] [x2gobroker] 11/17: debian/{control, x2gobroker-common.install}: Split out common files into non-Pythonian bin:pkg.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 6efbbc451f9b0c6fd416d0d5cca629f1da063a8b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 24 02:34:53 2017 +0200

    debian/{control,x2gobroker-common.install}: Split out common files into non-Pythonian bin:pkg.
---
 debian/control                                     | 73 +++++++++++++++-------
 debian/python3-x2gobroker.install                  |  5 --
 ...2gobroker.install => x2gobroker-common.install} |  1 -
 3 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index ba29d8f..c479142 100644
--- a/debian/control
+++ b/debian/control
@@ -18,22 +18,18 @@ Build-Depends:
 Standards-Version: 4.1.0
 XS-Python-Version: >= 3.4
 
-Package: python3-x2gobroker
-Section: python
+Package: x2gobroker
 Architecture: all
 Depends:
  ${misc:Depends},
  python3,
- python3-daemon,
- python3-lockfile,
- python3-pampy,
- python3-netaddr,
+ python3-setproctitle,
  python3-tornado,
- python3-paramiko,
- python3-urllib3,
-Recommends:
- python3-simplejson,
-Description: X2Go Session Broker (Python modules)
+ python3-wsgilog,
+ python3-x2gobroker (>= ${source:Version}), python3-x2gobroker (<< ${source:Version}.1~),
+Suggests:
+ apache2 | httpd,
+Description: X2Go Session Broker (executable)
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
@@ -49,21 +45,55 @@ Description: X2Go Session Broker (Python modules)
  .
  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.
+ This package contains the x2gobroker executable.
 
-Package: x2gobroker
+Package: x2gobroker-common
+Architecture: all
+Depends:
+ ${misc:Depends},
+Breaks:
+ python-x2gobroker (<< 0.0.4.0~),
+Replaces:
+ python-x2gobroker (<< 0.0.4.0~),
+Description: X2Go Session Broker (common files)
+ X2Go is a server based computing environment with
+    - session resuming
+    - low bandwidth support
+    - session brokerage 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 x2gobroker common files.
+
+Package: python3-x2gobroker
+Section: python
 Architecture: all
 Depends:
  ${misc:Depends},
  python3,
- python3-setproctitle,
+ python3-daemon,
+ python3-lockfile,
+ python3-pampy,
+ python3-netaddr,
  python3-tornado,
- python3-wsgilog,
- python3-x2gobroker (>= ${source:Version}), python3-x2gobroker (<< ${source:Version}.1~),
-Suggests:
- apache2 | httpd,
-Description: X2Go Session Broker (executable)
+ python3-paramiko,
+ python3-urllib3,
+ x2gobroker-common (>= ${source:Version}),
+Recommends:
+ python3-simplejson,
+Breaks:
+ python-x2gobroker (<< 0.0.4.0),
+Replaces:
+ python-x2gobroker (<< 0.0.4.0),
+Description: X2Go Session Broker (Python3 modules)
  X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
@@ -79,7 +109,8 @@ Description: X2Go Session Broker (executable)
  .
  A session broker is most useful in load balanced X2Go server farms.
  .
- This package contains the x2gobroker executable.
+ This package contains common files needed by all X2Go session
+ brokers being package for this distribution.
 
 Package: x2gobroker-authservice
 Architecture: all
diff --git a/debian/python3-x2gobroker.install b/debian/python3-x2gobroker.install
index 702c646..1b91047 100644
--- a/debian/python3-x2gobroker.install
+++ b/debian/python3-x2gobroker.install
@@ -1,6 +1 @@
-etc/x2gobroker.conf etc/x2go/
-etc/broker/x2gobroker-sessionprofiles.conf etc/x2go/broker/
-etc/broker/x2gobroker-loggers.conf etc/x2go/broker/
-etc/broker/defaults.conf etc/x2go/broker/
-pam/x2gobroker etc/pam.d/
 usr/
diff --git a/debian/python3-x2gobroker.install b/debian/x2gobroker-common.install
similarity index 97%
copy from debian/python3-x2gobroker.install
copy to debian/x2gobroker-common.install
index 702c646..99e4765 100644
--- a/debian/python3-x2gobroker.install
+++ b/debian/x2gobroker-common.install
@@ -3,4 +3,3 @@ etc/broker/x2gobroker-sessionprofiles.conf etc/x2go/broker/
 etc/broker/x2gobroker-loggers.conf etc/x2go/broker/
 etc/broker/defaults.conf etc/x2go/broker/
 pam/x2gobroker etc/pam.d/
-usr/

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git