[X2Go-Commits] [x2goclient] 01/01: debian/control: Add alternative D for nxproxy: qvd-nxproxy. Allows parallel installation of X2Go Client and the TheQVD client (perl-qvd-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 x2goclient.

commit 91f3d250f6bde6f4b5514bd570108e476a60e7d2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 19 23:41:55 2015 +0200

    debian/control: Add alternative D for nxproxy: qvd-nxproxy. Allows parallel installation of X2Go Client and the TheQVD client (perl-qvd-client).
---
 debian/changelog |    5 +++++
 debian/control   |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 067c09b..910b31d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,11 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
     - sshmasterconnection.cpp: port QProcess::start () change.
     - sshprocess.cpp: whitespace/prettify only and a compile fix.
 
+  [ Mike Gabriel ]
+  * debian/control:
+    + Add alternative D for nxproxy: qvd-nxproxy. Allows parallel installation
+      of X2Go Client and the TheQVD client (perl-qvd-client).
+
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
 x2goclient (4.0.4.0-0x2go1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index becd4bc..46f256b 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  openssh-client,
- nxproxy,
+ nxproxy | qvd-nxproxy,
 Recommends:
  openssh-server,
  rdesktop | freerdp-x11,

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