[X2Go-Commits] [python-x2go] 01/01: debian/control: Allow qvd-nxproxy as an alternative to nxproxy. Allows co-installation of PyHoca-CLI+GUI and the TheQVD client.

[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 python-x2go.

commit 860fa9828b06c7c0ee0ac930d8f07d9d5e96c61a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 19 21:53:51 2015 +0200

    debian/control: Allow qvd-nxproxy as an alternative to nxproxy. Allows co-installation of PyHoca-CLI+GUI and the TheQVD client.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7a6d4b5..ae68e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ python-x2go (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
     - No such constant loglevel_WARNING, must be logolevel_WARN.
     - End session gracefully if we fail setting up the SSH agent forwarding
       socket.
+  * debian/control:
+    + Allow qvd-nxproxy as an alternative to nxproxy. Allows co-installation
+      of PyHoca-CLI+GUI and the TheQVD client.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 26 Feb 2015 10:16:25 +0100
 
diff --git a/debian/control b/debian/control
index d18f591..7874fcb 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Depends:
  python-requests,
  python-simplejson,
  python-xlib,
- nxproxy,
+ nxproxy | qvd-nxproxy,
  sshfs,
 Recommends:
  cups-bsd | lpr,

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