[X2Go-Commits] [x2goclient] 01/01: debian/control: In x2goclient R, prefer freerdp2-x11 over rdesktop over freerdp-x11 (which is broken these days anyway).

[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 d9e60661e8e4134c464d3fbca7e9033ab3464149
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 21:58:00 2018 +0100

    debian/control: In x2goclient R, prefer freerdp2-x11 over rdesktop over freerdp-x11 (which is broken these days anyway).
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 13ab867..58108f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,9 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       sftp-server paths.
     - src/sessionwidget.cpp: Rename shadowing sessiontype to 'X2Go/X11 Desktop
       Sharing'.
+  * debian/control:
+    - In x2goclient R, prefer freerdp2-x11 over rdesktop over freerdp-x11 (which
+      is broken these days anyway).
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 Jun 2018 00:39:28 +0200
 
diff --git a/debian/control b/debian/control
index 0d8ba7a..a9d437f 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Depends:
  nxproxy | qvd-nxproxy,
 Recommends:
  openssh-server,
- rdesktop | freerdp-x11,
+ freerdp2-x11 | rdesktop | freerdp-x11,
 Suggests:
  pinentry-x2go,
 Conflicts:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git