[X2Go-Commits] [x2goclient] 13/19: debian/control.in: add Qt version switching support.

git-admin at x2go.org git-admin at x2go.org
Wed May 12 19:28:23 CEST 2021


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

x2go pushed a commit to branch master
in repository x2goclient.

commit c13c37ce3cfb155de9d7152ced7fcc6d10e64f1b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri May 7 09:04:26 2021 +0200

    debian/control.in: add Qt version switching support.
---
 debian/changelog  |  1 +
 debian/control.in | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b2ec99..a03618b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     + Switch to priority: optional. "extra" has been deprecated long ago.
       Pulled from Mike's changes.
     + Drop x2goplugin{,-{provider,dbg}}. It's been dead long enough.
+    + Add Qt version switching support.
   * debian/copyright:
     + Switch Upstream-Contact to myself. Pulled from Mike's changes.
     + Add new license "GPL-2+~OpenSSL" for the modified GPL 2+ license
diff --git a/debian/control.in b/debian/control.in
index 6c8d47b..49fd57a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,14 @@ Uploaders:
  Mihai Moldovan <ionic at ionic.de>,
 Build-Depends:
  debhelper (>= 7.0.50~),
+@?@@QT_VERSION@@ == 4
  libqt4-dev,
+@!
+ libqt5svg5-dev,
+ libqt5x11extras5-dev,
+ qtbase5-dev,
+ qttools5-dev-tools,
+@/
  libldap2-dev,
  libssh-dev (>= 0.5.4-2~),
  libcups2-dev,
@@ -32,13 +39,15 @@ Depends:
 Recommends:
  openssh-server,
  freerdp2-x11 | rdesktop | freerdp-x11,
+@?@@QT_VERSION@@ == 4
 Suggests:
  pinentry-x2go,
+@/
 Conflicts:
  x2goclient-gtk,
 Replaces:
  x2goclient-gtk,
-Description: X2Go Client application (Qt4)
+Description: X2Go Client application (Qt@@QT_VERSION@@)
  X2Go is a serverbased computing environment with
     - session resuming
     - low bandwidth support
@@ -48,7 +57,7 @@ Description: X2Go Client application (Qt4)
     - audio support
     - authentication by smartcard and USB stick
  .
- X2Go Client is a graphical client (Qt4) for the X2Go system.
+ X2Go Client is a graphical client (Qt@@QT_VERSION@@) for the X2Go system.
  You can use it to connect to running sessions and start new sessions.
 
 Package: x2goclient-dbg
@@ -57,7 +66,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  x2goclient (= ${binary:Version}),
-Description: X2Go Client application (Qt4), debug symbols (client)
+Description: X2Go Client application (Qt@@QT_VERSION@@), debug symbols (client)
  X2Go is a serverbased computing environment with
     - session resuming
     - low bandwidth support

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


More information about the x2go-commits mailing list