[X2Go-Commits] [x2gokdrive] 02/02: debian/control: depend upon libxfont1-dev << 1.5.2 (which is the version in Debian 9/stretch) or fall back to libxfont-dev *and* make sure that the libxfont1-dev version is greater than 1.4.2.

[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 x2gokdrive.

commit 1d0b61512c43a44fa2e7eae5940ec96673f2e1aa
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 20 15:37:07 2020 +0100

    debian/control: depend upon libxfont1-dev << 1.5.2 (which is the version in Debian 9/stretch) or fall back to libxfont-dev *and* make sure that the libxfont1-dev version is greater than 1.4.2.
    
    This should essentially emulate libxfont1-dev (>> 1.4.2 << 1.5.2) |
    libxfont-dev (>> 1.4.2) and fix issues with "hello" being picked with
    subsequent dependencies being dropped (like libunwind, which is usually
    not optional).
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ed189e..d3a52a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,12 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       libXfont2, but Debian 9/stretch uses X.Org Server 1.19.2, which is
       compatible with libXfont2 (and actually requires it), but also has both
       packages available.
+    + Depend upon libxfont1-dev << 1.5.2 (which is the version in Debian
+      9/stretch) or fall back to libxfont-dev *and* make sure that the
+      libxfont1-dev version is greater than 1.4.2. This should essentially
+      emulate libxfont1-dev (>> 1.4.2 << 1.5.2) | libxfont-dev (>> 1.4.2) and
+      fix issues with "hello" being picked with subsequent dependencies being
+      dropped (like libunwind, which is usually not optional).
   * x2gokdrive.spec:
     + Drop Debian-style formatting in description.
     + Typo fixes.
diff --git a/debian/control b/debian/control
index 9884bfb..abe5957 100644
--- a/debian/control
+++ b/debian/control
@@ -47,8 +47,8 @@ Build-Depends:
  xtrans-dev (>= 1.3.2),
  libxau-dev (>= 1:1.0.5-2),
  libxdmcp-dev (>= 1:0.99.1),
- libxfont1-dev (>= 1.4.2) | hello,
- libxfont-dev (>= 1.4.2),
+ libxfont1-dev (<< 1:1.5.2) | libxfont-dev (>= 1.4.2),
+ libxfont1-dev (>> 1.4.2) | libxfont-dev (>= 1.4.2),
  libxkbfile-dev (>= 1:0.99.1),
  libpixman-1-dev (>= 0.27.2),
  libpciaccess-dev (>= 0.12.901),

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